18497 Commits

Author SHA1 Message Date
Xavier Ducrohet
b9d2dc2319 Add --auto-add-overlay option to aapt. DO NOT MERGE
This option allows resources only present in overlays to be
added automatically instead of being declared through <add-resource>

(merge from master)

Change-Id: I5f402a1fa7213d18724d91f84bc05ef39ace2ed9
2010-02-12 17:37:50 -08:00
Jason Sams
6f8a3dfa6b Merge "Add comment block matching the type defines added by RS." 2010-02-12 17:26:46 -08:00
Jason Sams
941533186c Add comment block matching the type defines added by RS. 2010-02-12 17:25:47 -08:00
Doug Zongker
d2affae13d add a Base64 implementation to the API
b/1413917 - RFE: Base64 utility class
Change-Id: I11697859e1f78f596b92d2e03a49ed1be04ae42d
2010-02-12 17:13:56 -08:00
Gloria Wang
190dd57fb8 Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)" 2010-02-12 17:04:29 -08:00
Gloria Wang
8d00b53cc4 Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression) 2010-02-12 16:46:40 -08:00
Chris Tate
cf36010357 Merge "Remove BACKUP_DATA permission and associated checks" 2010-02-12 16:30:39 -08:00
Dianne Hackborn
d705fd2b0a Tweak updatecmds to be able to move entire directories. 2010-02-12 16:29:50 -08:00
Gilles Debunne
f5c6eff63d Force layout on TableRows when column widths are shrinked or streched.
Also features some comment typos and import re-ordering.

Change-Id: I32cb14419d7d349064032718469daf62a0a72e3a
2010-02-12 15:57:12 -08:00
Adam Powell
f2a204e792 Added proper overscrolling scroll bar behavior to GridView 2010-02-12 15:54:59 -08:00
Gilles Debunne
a10b48d5a5 Merge "Closed tabs removed from layout." 2010-02-12 15:50:05 -08:00
Christopher Tate
a87240c227 Remove BACKUP_DATA permission and associated checks
Any package can now participate in backup/restore, without requiring any
manifest-declared permission.  *Control* of the backup manager is still
guarded by the BACKUP permission, which is signatureOrSystem.

Change-Id: I116fcfcd4cd255e3c976330da1c4dea7d4faae9d
2010-02-12 15:49:30 -08:00
Scott Main
7e7605ace9 am de7b14f9: am 19bc31c3: Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Merge commit 'de7b14f9ab3df84bcb6af0775e96cab02648cbd9'

* commit 'de7b14f9ab3df84bcb6af0775e96cab02648cbd9':
  docs: remove old tutorial and sample pages from the sitemap
2010-02-12 15:35:58 -08:00
Mike LeBeau
60d21566fc Merge "Really fix the build - one more change to SearchDialog which shouldn't have been submitted." 2010-02-12 15:30:42 -08:00
Mike LeBeau
0ffc570598 Really fix the build - one more change to SearchDialog which shouldn't have
been submitted.
2010-02-12 15:30:12 -08:00
Scott Main
de7b14f9ab am 19bc31c3: Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Merge commit '19bc31c32d75ebebacd85cac2cf4c31108329613' into eclair-plus-aosp

* commit '19bc31c32d75ebebacd85cac2cf4c31108329613':
  docs: remove old tutorial and sample pages from the sitemap
2010-02-12 15:29:27 -08:00
Mike LeBeau
85c4e99382 Merge "Oops, unbreak the build by removing Recognition.java, not intended for submission at this time." 2010-02-12 15:27:12 -08:00
Mike LeBeau
5741848d1e Oops, unbreak the build by removing Recognition.java, not intended for
submission at this time.
2010-02-12 15:26:22 -08:00
Scott Main
19bc31c32d Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair 2010-02-12 15:25:44 -08:00
Scott Main
17b583b71d docs: remove old tutorial and sample pages from the sitemap 2010-02-12 15:24:13 -08:00
Jim Miller
de3cf7ea1f Merge "Watch 2274882: Add a field to the db when we wipe due to an error in the upgrader." 2010-02-12 15:20:40 -08:00
Brad Fitzpatrick
0a3e94d017 Merge "Log previous SQL statement also when logging "COMMIT;" operations." 2010-02-12 15:20:14 -08:00
Amith Yamasani
0499498935 Add a new KEYBOARD_TAP haptic feedback type for very short, low-latency vibration.
The minimum value varies from device to device, so this is useful for defining
the shortest and most efficient vibration. The VibratorService creates a Thread
when playing back vibration patterns, so this allows you to avoid thread creation
and associated scheduling delays by specifying a one-shot duration in the config
file.
2010-02-12 15:10:37 -08:00
Jim Miller
6176677e01 Watch 2274882: Add a field to the db when we wipe due to an error in the upgrader.
This should give us the ability to diagnose and fix db upgrade errors as reported by partners and end users.
2010-02-12 14:56:49 -08:00
Andreas Huber
bab28017a5 Merge "Preserve a preview frame to be restored after resuming the playback session." 2010-02-12 14:52:41 -08:00
Dianne Hackborn
046ceb572f Merge "Totally remove Unicode.cpp and rely on ICU" 2010-02-12 14:49:54 -08:00
Andreas Huber
7b73cfcc75 Preserve a preview frame to be restored after resuming the playback session.
related-to-bug: 2231576
2010-02-12 14:41:51 -08:00
Kenny Root
a9886c580b Totally remove Unicode.cpp and rely on ICU
Unicode.cpp used a packed data table for character data that essentially
duplicated ICU's functionality.

Change-Id: Ia68fe4ac94e89dc68d9a3f45f33f6e648a5500b7
2010-02-12 14:37:42 -08:00
Scott Main
f2522ce487 Merge "API change. add cycle_interpolator resource (it's the only one missing among all Interpolators) and update public.xml and current.xml with the new resource." 2010-02-12 14:37:15 -08:00
Mike LeBeau
80eeeb7095 Merge "Make the corresponding frameworks change to add VoiceRecognitionService to the list of SDK sample apps." 2010-02-12 14:31:00 -08:00
Scott Main
749ee4fefd API change.
add cycle_interpolator resource (it's the only one missing among
all Interpolators) and update public.xml and current.xml with the new resource.
2010-02-12 14:13:27 -08:00
Mike LeBeau
9c57aca188 Make the corresponding frameworks change to add VoiceRecognitionService to
the list of SDK sample apps.
2010-02-12 14:09:55 -08:00
Mathias Agopian
7f66d6e63d Merge changes I128ce4b2,I5cbb940c
* changes:
  real fix for [2440014] launcher2 crashing in loop during boot
  Revert "Revert "RenderScript should not depend on libsurfaceflinger_client.so""
2010-02-12 14:09:03 -08:00
Mathias Agopian
128ce4b24a real fix for [2440014] launcher2 crashing in loop during boot
Surface* cannot be casted to void* and then to android_native_window_t*
2010-02-12 14:04:35 -08:00
Dianne Hackborn
96898b38fa Merge "Add Pointer Location to the window manager." 2010-02-12 13:55:00 -08:00
Jean-Baptiste Queru
d85639afb6 Merge "Public Download Manager API" 2010-02-12 13:48:51 -08:00
Kenny Root
a16e4ee840 Merge "Excise code from Unicode.cpp that was dead" 2010-02-12 13:25:14 -08:00
Andreas Huber
acc63512e9 Merge "New API on java's MediaPlayer to suspend/resume a session." 2010-02-12 13:21:22 -08:00
Dianne Hackborn
90d2db3d21 Add Pointer Location to the window manager.
The window manager now has pointer location built into it.
Viva la touch!
2010-02-12 13:19:06 -08:00
Kenny Root
564bfc27f2 Excise code from Unicode.cpp that was dead
Remove some utility functions for discovering character data
that ICU probably took over a while ago.

Change-Id: I97abe4de2f51eb2bf48679941258bc501184c3dc
2010-02-12 13:01:16 -08:00
Brad Fitzpatrick
b28c7972bd Log previous SQL statement also when logging "COMMIT;" operations.
Previously, as somewhat expected, the top SQL statements showing up in
the SQL analysis dashboards from developer phones was just "COMMIT;"
statements, which is pretty uselessly ambiguous.

Now the logs for commit operations look like:

I/db_operation( 1249): [/data/data/com.google.android.gsf/databases/subscribedfeeds.db,COMMIT;DELETE FROM _deleted_feeds WHERE _sync_account=? AND _syn,461,com.google.process.gapps,100]
I/db_operation( 1290): [/data/data/com.android.providers.contacts/databases/contacts2.db,COMMIT;SELECT account_name, account_type FROM _sync_state,126,android.process.acore,100]
I/db_operation( 1249): [/data/data/com.google.android.gsf/databases/talk.db,COMMIT;INSERT OR REPLACE  INTO providerSettings(value, name) VAL,252,com.google.process.gapps,100]
I/db_operation( 1377): [/data/data/com.android.providers.calendar/databases/calendar.db,COMMIT;SELECT localTimezone, minInstance, maxInstance FROM Calen,948,,100]
I/db_operation( 1377): [/data/data/com.android.providers.calendar/databases/calendar.db,COMMIT;SELECT begin-(minutes*60000) AS myAlarmTime, Instances.ev,82,,83]

It doesn't totally pin-point the offending code, but it should get us
most of the way there.  We may enhance this logging again in the
future.
2010-02-12 12:49:41 -08:00
Andreas Huber
fbb3885024 New API on java's MediaPlayer to suspend/resume a session.
related-to-bug: 2231576
2010-02-12 12:44:10 -08:00
Andreas Huber
ba7ec917ea Squashed commit of the following:
commit 427e927298449826bb5b98327b0c05957aa051e6
Author: Andreas Huber <andih@google.com>
Date:   Fri Feb 12 10:39:07 2010 -0800

    Fixing a race condition in AwesomePlayer and support for suspend/resume.

commit 96201a04b6657b6bd69ec6100f4de66aebcaa0b4
Author: Andreas Huber <andih@google.com>
Date:   Fri Feb 12 10:36:15 2010 -0800

    Protect MPEG4Source's sanity by properly locking.

related-to-bug: 2231576
2010-02-12 12:43:34 -08:00
Mathias Agopian
5cbb940cf6 Revert "Revert "RenderScript should not depend on libsurfaceflinger_client.so""
This reverts commit a0659aa36c987e28e29778bd97e75fe52152c60e.
2010-02-12 12:00:38 -08:00
Jeff Hamilton
965e37ec88 Merge "Dump original-package entries." 2010-02-12 11:47:23 -08:00
Jeff Hamilton
e2c17f9174 Dump original-package entries.
Change-Id: I29b20811847555ff9858ef47cca69c8b992b24ea
2010-02-12 13:45:16 -06:00
Nico Sallembien
d72b313726 Merge "Map base station lat-lng of "0","0" to undefined." 2010-02-12 11:36:59 -08:00
Adam Powell
1257b1016c Merge "Fix javadoc link for SDK build breakage" 2010-02-12 11:35:17 -08:00
Jason Sams
41fe19afe7 am 79b646ff: (-s ours) am 0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Merge commit '79b646ffe51c532f00b69dc4967ee51ca28986cf'

* commit '79b646ffe51c532f00b69dc4967ee51ca28986cf':
  DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid.  This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
2010-02-12 11:33:46 -08:00
Adam Powell
4886d40091 Fix javadoc link for SDK build breakage 2010-02-12 11:32:47 -08:00