1258 Commits

Author SHA1 Message Date
Mathias Agopian
230d46d5ea am 2accb31: this should fix the build
Merge commit '2accb31239cf7a3cad77b51baed4b23934636e5b'

* commit '2accb31239cf7a3cad77b51baed4b23934636e5b':
  this should fix the build
2009-05-08 22:51:16 -07:00
Dianne Hackborn
849e89c94d am 851a541: Implement targetSdkVersion and maxSdkVersion, plus version c
Merge commit '851a54143c15a1c33361efae2db3f7f45059b472'

* commit '851a54143c15a1c33361efae2db3f7f45059b472':
  Implement targetSdkVersion and maxSdkVersion, plus version code names.
2009-05-08 22:51:10 -07:00
Mathias Agopian
2accb31239 this should fix the build 2009-05-08 17:07:35 -07:00
Dianne Hackborn
851a54143c Implement targetSdkVersion and maxSdkVersion, plus version code names.
This adds new attributes for specifying a targetSdkVersion and maxSdkVersion.
There is a new ApplicationInfo flag that is set if the application has set
its targetSdkVersion to the current platform or later.  Also you can now
use a string for minSdkVersion and targetSdkVerion, to indicate you are
building against a development tree instead of an official platform.
2009-05-08 15:15:36 -07:00
The Android Open Source Project
3531fdb1d9 merge 55280a9
Merge commit '55280a9'
2009-05-08 13:33:21 -07:00
Dianne Hackborn
55280a9188 Improve shutdown process to send broadcast for applications.
This introduces a new class in the base platform for performing a clean
shutdown (which was copied from the classes in the policies).  It
includes new features to send a shutdown broadcast for applications
to do cleanup, and ot have the activity manager pause the current
activity before proceeding with the shutdown.  These facilities are
also use to write at the most recent stat files for sync, battery
and user activity.
2009-05-08 12:59:21 -07:00
The Android Open Source Project
8ca7d85d82 manual merge 3a6645a
Merge commit '3a6645a'
2009-05-08 12:16:40 -07:00
Amith Yamasani
f04da95400 Fix keyboard redraw bug on long-press of CapsLock.
Expose invalidateKey and invalidateAllKeys for subclasses to call when needed.
2009-05-08 10:34:39 -07:00
The Android Open Source Project
ac1514c5b0 manual merge of 1e09a72
Merge commit '1e09a72'
2009-05-08 07:23:54 -07:00
The Android Open Source Project
1a36071092 manual merge of 7ec32cc
Merge commit '7ec32cc'
2009-05-08 07:21:43 -07:00
Jeff Hamilton
b890889267 Fix the build.
There was an issue with current.xml from a previous backup related change. Joe blames the stage.
2009-05-07 18:52:53 -07:00
Joe Onorato
b1a7ffef3a More backup tests 2009-05-07 15:32:48 -07:00
The Android Open Source Project
cfe5cdd3a1 manual merge d90a331 to avoid conflicts
Merge commit 'd90a331'
2009-05-06 18:16:52 -07:00
Romain Guy
d90a33111b Add new setTag(int, Object) API to allow applications to specify several tags. 2009-05-06 16:49:56 -07:00
The Android Open Source Project
56b7eeaa01 manual merge f3af740bdfc261b1cb25c0799af780d3753d4518
Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
2009-05-06 15:48:33 -07:00
The Android Open Source Project
761daf7550 manual merge for b9c9d260f21b321527c4622a123af9767630d94d
Merge commit 'b9c9d260f21b321527c4622a123af9767630d94d'
2009-05-06 15:43:48 -07:00
Eric Laurent
f3af740bdf Fixed issue 1709450: Requirements for CDMA Tone Generator
Added new tone types for CDMA IS-95 specific tones.
Automatic selection between IS-95, CEPT and JAPAN version base on operator
country code for call supervisory tones.
Also improved tone generator capabilities:
- Each tone segment can now generate its own set of frequencies
- A tone does not have to be a succession of alternating ON/OFF segments
- The sequence repetition does not have to start from first segment
2009-05-06 11:35:46 -07:00
Eric Laurent
b9c9d260f2 fix issue 1713090: After a Bluetooth call, MusicPlayer starts playing on speaker rather than wired external audio.
Temporary fix until audio routing is refactored in Eclair release:
- centralized and synchronized all audio routing control in AudioService.setRouting()
- deprecated AudioManager.setRouting() and AudioManager.getRouting() methods
2009-05-06 10:52:19 -07:00
Dianne Hackborn
7a13559501 merged 231cc608d06ffc31c24bf8aa8c8275bdd2636581 2009-05-06 00:28:37 -07:00
Dianne Hackborn
231cc608d0 Rewrite SyncStorageEngine to use flat files and in-memory data structures.
The previous implementation used a database for storing all of its state, which could cause
a significant amount of IO activity as its tables were updated through the stages of a sync.
This new implementation replaces that in-memory data structures, with hand-written code
for writing them to persistent storage.

There are now 4 files associated with this class, holding various pieces of its state that
should be consistent.  These are everything from a main XML file of account information that
must always be retained, to a binary file of per-day statistics that can be thrown away at
any time.  Writes of these files as scheduled at various times based on their importance of
the frequency at which they change.

Because the database no longer exists, there needs to be a new explicit interface for
interacting with the sync manager database.  This is provided by new APIs on IContentService,
with a hidden method on ContentResolver to retrieve the IContentService so that various
system entities can use it.  Other changes in other projects are required to update to the
new API.

The goal here is to have as little an impact on the code and functionality outside of
SyncStorageEngine, though due to the necessary change in API it is still somewhat extensive.
2009-05-05 15:40:53 -07:00
Android (Google) Code Review
a3fcb44a26 Manual cherry-pick of 821427eac75d88f1388935e0a2f0564be8979e58 into master
* changes:
  Merge change 847 into donut
2009-05-04 12:43:45 -07:00
Dave Bort
52fa7c2afd Config: Deprecate most fields, and hook into ConfigBuildFlags
Copy 3.xml to 4.xml, and patch 4.xml to deal with the fact that
Config.DEBUG's value is no longer actually fixed.  We don't want
to modify 3.xml directly, because it's the official cupcake API.

Update current.xml to reflect the differences between 3.xml and 4.xml
and to reflect the new deprecation states.

The deprecated fields should be @hidden if possible before the
next API release, but it can't be done yet because there are
SDK-linked platform apps that use some of the deprecated fields.

Signed-off-by: Dave Bort <dbort@android.com>
2009-05-01 17:47:13 -07:00
Romain Guy
4ade578837 Fix the build 2009-05-01 14:41:53 -07:00
Mike Lockwood
e90c0da675 am 275555c: location: Add support for location providers outside of the
Merge commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e'

* commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e':
  location: Add support for location providers outside of the system process.
2009-05-01 12:39:03 -07:00
Mike Lockwood
275555c8eb location: Add support for location providers outside of the system process.
Also added new permissions android.permission.INSTALL_LOCATION_PROVIDER
and android.permission.INSTALL_LOCATION_COLLECTOR to the public API.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-01 15:06:31 -04:00
Romain Guy
a426c9609f am 9a81736: Add the ability to specify the onClick handler with XML.
Merge commit '9a81736176f507489f262344b6e3d55bbe53be7c'

* commit '9a81736176f507489f262344b6e3d55bbe53be7c':
  Add the ability to specify the onClick handler with XML. The new android:onClick attribute defines the name of the method in the Activity to invoke when the button is clicked. The method has to be public and get one View parameter.
2009-05-01 12:00:19 -07:00
The Android Open Source Project
bc6244933f fixed value for android.R.attr.searchSuggestThreshold 2009-05-01 11:10:33 -07:00
Romain Guy
9a81736176 Add the ability to specify the onClick handler with XML. The new android:onClick attribute defines the name of the method in the Activity to invoke when the button is clicked. The method has to be public and get one View parameter. 2009-05-01 10:57:14 -07:00
Fred Quintana
f7b06100ca submit an updated current.xml 2009-05-01 10:32:59 -07:00
Bjorn Bringert
da7b5e2dac Partly fix master build, by bumping attr IDs.
Fixes conflicting attr IDs due to donut-to-master automerge.
As a side effect, it fixes the "Field android.R.attr.contentAuthority
has changed value from 16843373 to 16843374" error introduced by change
804.

Background:

I submitted two changes to donut that add new public attributes:
https://android-git.corp.google.com/g/Gerrit#change,795
https://android-git.corp.google.com/g/Gerrit#change,796

This was fine in donut (though still waiting for build server to
finish), but when auto-merged to master it caused a new build breakage.
This was on top of existing breakage due to
https://android-git.corp.google.com/g/Gerrit#change,804

The problem is that there are now multiple attribute definitions with
identical IDs, as you can see at the bottom of:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blob;f=core/res/res/values/public.xml;h=becc90ef05481321c60301176b91ca7b4553a6d7;hb=master

This did not cause an automerge failure, since my new attributes were
in the "platform 4" section, whereas the new attributes in master were
in the "platform 5" section. It seems like the temporary solution
would be to change the resource IDs in "platform 5" to come after the
ones in "platform 4". But the next time someone adds an attribute in
"platform 4", we will have the same problem. Any ideas?
2009-05-01 10:58:45 +01:00
Bjorn Bringert
6c1dc3212b am a56b318: NEW_API: Expose includeInGlobalSearch searchable attribute
Merge commit 'a56b318cf2d4c3700899f9de394c5635761dda66'

* commit 'a56b318cf2d4c3700899f9de394c5635761dda66':
  NEW_API: Expose includeInGlobalSearch searchable attribute
2009-05-01 02:11:01 -07:00
Bjorn Bringert
085dd21563 am 232cd50: NEW_API: Expose searchSuggestThreshold searchable attribute
Merge commit '232cd50f152b919f0918ee3f9fbdaf6ee1ae9f63'

* commit '232cd50f152b919f0918ee3f9fbdaf6ee1ae9f63':
  NEW_API: Expose searchSuggestThreshold searchable attribute
2009-05-01 02:10:58 -07:00
Bjorn Bringert
a56b318cf2 NEW_API: Expose includeInGlobalSearch searchable attribute
If this attribute is provided and true, the searchable activity will be
included in any global lists of search targets.

This is needed to support third-party suggestion providers in
global search. See http://b/issue?id=1819651
2009-05-01 09:43:49 +01:00
Bjorn Bringert
232cd50f15 NEW_API: Expose searchSuggestThreshold searchable attribute
This lets the searchable activity specify the number of
characters needed to trigger suggestions. Before, this was
hard-coded at 0. This caused unnecessary querying of the
suggestion provider in cases where the provider does not
return suggestions for empty or short queries.
2009-05-01 09:43:48 +01:00
Fred Quintana
718d8a2d7f decouple SyncAdapter from ContentProvider 2009-04-30 17:28:09 -07:00
Android (Google) Code Review
072868a4d3 am 3674252: Merge change 817 into donut
Merge commit '36742528f89fd13e65c8652cc684cffc9e97b567'

* commit '36742528f89fd13e65c8652cc684cffc9e97b567':
  Hide the backup stuff for now
2009-04-30 13:14:48 -07:00
Christopher Tate
c114eb55b4 Hide the backup stuff for now
Also adjust based on comments:
+ changed service intent string to conform to usage guidelines
+ only publish the IBackupService binder when invoked with the right
  intent action
+ docs tweaks
2009-04-30 12:40:19 -07:00
Android (Google) Code Review
171134a0e2 am 021dce4: Merge change 811 into donut
Merge commit '021dce4198afbf602109ba5807a193c437b05361'

* commit '021dce4198afbf602109ba5807a193c437b05361':
  Add android.backup.BackupManager
2009-04-30 12:34:10 -07:00
Christopher Tate
a8bf815c61 Add android.backup.BackupManager
Also tweak the dataChanged() api to have the client supply a package name.  We
don't necessarily TRUST this, but we use it to narrow the set of packages requesting
a backup pass, no longer blithely scheduling a pass for all packages associated
with the caller's uid.
2009-04-30 11:36:21 -07:00
Ben Murdoch
7df1985e86 Merges p9 CLs 144856 and 145055 to GIT to enable the Database API in the browser. 2009-04-30 13:46:01 +01:00
android-build SharedAccount
d2d9cd0a9b fix the build 2009-04-30 00:25:53 -07:00
Christopher Tate
f8997690da am 487529a: First baby steps towards settings backup
Merge commit '487529a70cd1479ae8d6bbfb356be7e72542c185'

* commit '487529a70cd1479ae8d6bbfb356be7e72542c185':
  First baby steps towards settings backup
2009-04-29 15:16:57 -07:00
Android (Google) Code Review
b0d8abd591 am 73b7184: Merge change 748 into donut
Merge commit '73b71842dc9c943d69ce28212776ce671e54bcdb'

* commit '73b71842dc9c943d69ce28212776ce671e54bcdb':
  Fix the build.
2009-04-29 15:16:52 -07:00
Christopher Tate
487529a70c First baby steps towards settings backup
This change adds a sketched outline of the backup system architecture, with
all of the major pieces represented other than client-side helpers for
specific types of data.  IBackupManager and BackupService are public so that
we can write test apps against SDK-domain symbols from the outset.

What code exists in this change hasn't been tested and may crash.  It's the
beginnings of the real implementation but of course is barely begun.
2009-04-29 14:49:30 -07:00
Romain Guy
2a4bf5cee3 Fix the build. 2009-04-29 13:50:54 -07:00
Mitsuru Oshima
4cc574be4e am 257eef3: Merge branch \'readonly-p4-donut\' into donut
Merge commit '257eef353dfc9519b63e3fe2616505c5534b460a'

* commit '257eef353dfc9519b63e3fe2616505c5534b460a':
  AI 147845: Compatibility mode support. Part 1
2009-04-29 13:35:29 -07:00
Android (Google) Code Review
772a767086 am 9e8ca9a: Merge change 551 into donut
Merge commit '9e8ca9a19c8625b22f37c2f8c0ac841d1f10d25a'

* commit '9e8ca9a19c8625b22f37c2f8c0ac841d1f10d25a':
  Enable static Java APIs for OpenGL ES 1.1 extensions.
2009-04-29 13:35:24 -07:00
Android (Google) Code Review
1e89ef82b1 am 947fe79: Merge change 483 into donut
Merge commit '947fe79e99d5536a10c5b81946d20e69d0e9d479'

* commit '947fe79e99d5536a10c5b81946d20e69d0e9d479':
  API_CHANGE: external_storage: Add SDCARD_WRITE permission with associated strings
2009-04-29 13:11:28 -07:00
Mitsuru Oshima
257eef353d Merge branch 'readonly-p4-donut' into donut 2009-04-27 12:02:51 -07:00
Mitsuru Oshima
8d11267587 AI 147845: Compatibility mode support. Part 1
Adding supports-density tag to manifest file/ApplicationInfo.
  BUG=1752478

Automated import of CL 147845
2009-04-27 12:01:23 -07:00