OSDN Git Service
Cary Clark [Thu, 23 Apr 2009 17:12:19 +0000 (13:12 -0400)]
don't swap out the history picture too soon
Wait until either the picture is not blank or
the progress is complete.
Cary Clark [Mon, 20 Apr 2009 20:03:31 +0000 (16:03 -0400)]
reset select/copy state if key is pressed while shift is down
If a webpage suppresses keys from getting echoed back to the
browser app, then also disable select/copy when a key follows
a shift key press.
Also add in missing debug string to permit debug builds.
Android (Google) Code Review [Thu, 23 Apr 2009 01:51:09 +0000 (18:51 -0700)]
Merge change 431
* changes:
package run_page_cycler.py into apk and add code for extraction
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:17 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:26:57 +0000 (18:26 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:58 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:28:41 +0000 (17:28 -0700)]
Regenerate current.xml after merge
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:34 +0000 (17:12 -0700)]
Merge donut into master
Android (Google) Code Review [Wed, 22 Apr 2009 23:44:52 +0000 (16:44 -0700)]
Merge change 289 into donut
* changes:
Changes for new ril.h.
Wink Saville [Wed, 22 Apr 2009 21:52:11 +0000 (14:52 -0700)]
Changes for new ril.h.
These allow RIL.java to assume ril.cpp is interfacing
to the new CDMA capable vendor ril. At the moment we
don't have a full CDMA capabile ril so thre are some
NEWRIL:TODO's in the code base to identify these areas.
Dirk Dougherty [Wed, 22 Apr 2009 20:39:58 +0000 (13:39 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 22 Apr 2009 20:38:45 +0000 (13:38 -0700)]
AI 147338: am: CL 147336 Remove stuff relating to the Maps ext library from the docs. Leave a pointer over to code.google.com.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147338
Dirk Dougherty [Wed, 22 Apr 2009 20:37:15 +0000 (13:37 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 22 Apr 2009 20:35:59 +0000 (13:35 -0700)]
AI 147334: am: CL 147332 Miscellaneous doc changes for cupcake SDK
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147334
Scott Main [Wed, 22 Apr 2009 20:34:31 +0000 (13:34 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Wed, 22 Apr 2009 20:33:18 +0000 (13:33 -0700)]
AI 147327: am: CL 147325 update the installing and upgrading docs for cupcake
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 147327
Scott Main [Wed, 22 Apr 2009 20:28:57 +0000 (13:28 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Wed, 22 Apr 2009 20:27:42 +0000 (13:27 -0700)]
AI 147317: am: CL 147314 change carousel SDK to 1.5;
revise Google IO info
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 147317
Scott Main [Wed, 22 Apr 2009 20:26:11 +0000 (13:26 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Wed, 22 Apr 2009 20:24:58 +0000 (13:24 -0700)]
AI 147313: am: CL 147311 update eclipse docs to include necessary AVD procedures and
discuss relevant target facilities
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 147313
Scott Main [Wed, 22 Apr 2009 20:23:29 +0000 (13:23 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Wed, 22 Apr 2009 20:22:17 +0000 (13:22 -0700)]
AI 147308: am: CL 147306 re-write the Developing in Other IDEs doc with updated information for 1.5
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 147308
Dirk Dougherty [Wed, 22 Apr 2009 20:20:44 +0000 (13:20 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 22 Apr 2009 20:19:30 +0000 (13:19 -0700)]
AI 147303: am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147303
Eric Fischer [Wed, 22 Apr 2009 19:33:55 +0000 (12:33 -0700)]
AI 147406: Import revised translations.
Automated import of CL 147406
Jean-Baptiste Queru [Wed, 22 Apr 2009 19:09:59 +0000 (12:09 -0700)]
Merge commit 'goog/readonly-p4-donut' into HEAD
Conflicts:
location/java/android/location/Geocoder.java
Guang Zhu [Wed, 22 Apr 2009 16:58:25 +0000 (09:58 -0700)]
package run_page_cycler.py into apk and add code for extraction
Marco Nelissen [Wed, 22 Apr 2009 17:34:12 +0000 (10:34 -0700)]
Do case-insensitive matching when determining whether something is music, an alarm sound, notification sound, etc.
Android (Google) Code Review [Wed, 22 Apr 2009 16:57:03 +0000 (09:57 -0700)]
Merge change 358 into donut
* changes:
Fix issue
1745312: Various cleanups in media framework
Android (Google) Code Review [Wed, 22 Apr 2009 08:59:31 +0000 (01:59 -0700)]
Merge change 416 into donut
* changes:
Remove debug messages. modified: core/java/android/hardware/Camera.java
Wu-cheng Li [Wed, 22 Apr 2009 08:21:26 +0000 (16:21 +0800)]
Remove debug messages.
modified: core/java/android/hardware/Camera.java
modified: camera/libcameraservice/CameraService.cpp
Dirk Dougherty [Wed, 22 Apr 2009 08:08:00 +0000 (01:08 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Wed, 22 Apr 2009 08:06:41 +0000 (01:06 -0700)]
AI 147339: am: CL 147338 am: CL 147336 Remove stuff relating to the Maps ext library from the docs. Leave a pointer over to code.google.com.
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147339
Dirk Dougherty [Wed, 22 Apr 2009 08:05:08 +0000 (01:05 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Wed, 22 Apr 2009 08:03:47 +0000 (01:03 -0700)]
AI 147335: am: CL 147334 am: CL 147332 Miscellaneous doc changes for cupcake SDK
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147335
Scott Main [Wed, 22 Apr 2009 08:02:14 +0000 (01:02 -0700)]
Merge branch 'readonly-p4-master'
Scott Main [Wed, 22 Apr 2009 08:00:55 +0000 (01:00 -0700)]
AI 147328: am: CL 147327 am: CL 147325 update the installing and upgrading docs for cupcake
Original author: smain
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147328
Scott Main [Wed, 22 Apr 2009 07:56:26 +0000 (00:56 -0700)]
Merge branch 'readonly-p4-master'
Scott Main [Wed, 22 Apr 2009 07:55:10 +0000 (00:55 -0700)]
AI 147318: am: CL 147317 am: CL 147314 change carousel SDK to 1.5;
revise Google IO info
Original author: smain
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147318
Scott Main [Wed, 22 Apr 2009 07:53:37 +0000 (00:53 -0700)]
Merge branch 'readonly-p4-master'
Scott Main [Wed, 22 Apr 2009 07:52:20 +0000 (00:52 -0700)]
AI 147316: am: CL 147313 am: CL 147311 update eclipse docs to include necessary AVD procedures and
discuss relevant target facilities
Original author: smain
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147316
Scott Main [Wed, 22 Apr 2009 07:50:50 +0000 (00:50 -0700)]
Merge branch 'readonly-p4-master'
Scott Main [Wed, 22 Apr 2009 07:49:29 +0000 (00:49 -0700)]
AI 147309: am: CL 147308 am: CL 147306 re-write the Developing in Other IDEs doc with updated information for 1.5
Original author: smain
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147309
Dirk Dougherty [Wed, 22 Apr 2009 07:47:58 +0000 (00:47 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Wed, 22 Apr 2009 07:46:36 +0000 (00:46 -0700)]
AI 147305: am: CL 147303 am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147305
Android (Google) Code Review [Wed, 22 Apr 2009 06:44:04 +0000 (23:44 -0700)]
Merge change 404 into donut
* changes:
normalize the DATA_STATE_RADIO_OFF event log id definition
Android (Google) Code Review [Wed, 22 Apr 2009 06:43:45 +0000 (23:43 -0700)]
Merge change 403 into donut
* changes:
remove superfluous lines
Mike Lockwood [Wed, 22 Apr 2009 04:27:33 +0000 (21:27 -0700)]
Fix timing problem that was introduced when we removed location provider polling
The wake lock was not being held until after we enabled location tracking,
so the check to see if the wake lock was held before propogating a
new location prevented us from receiving a network location as soon as we
enabled the provider.
This check is not necessary anyway, so this change removes it.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Tammo Spalink [Tue, 21 Apr 2009 07:14:49 +0000 (15:14 +0800)]
normalize the DATA_STATE_RADIO_OFF event log id definition
Was this different intentionally? It looks internal, and with very limited usage, and so easy to bring in line with the others...
Tammo Spalink [Tue, 21 Apr 2009 06:54:18 +0000 (14:54 +0800)]
remove superfluous lines
Dirk Dougherty [Wed, 22 Apr 2009 03:39:18 +0000 (20:39 -0700)]
AI 147336: Remove stuff relating to the Maps ext library from the docs. Leave a pointer over to code.google.com.
BUG=
1790234
Automated import of CL 147336
Dirk Dougherty [Wed, 22 Apr 2009 03:25:36 +0000 (20:25 -0700)]
AI 147332: Miscellaneous doc changes for cupcake SDK
BUG=
1790234
Automated import of CL 147332
Mike Lockwood [Wed, 22 Apr 2009 03:18:41 +0000 (20:18 -0700)]
location: Remove support for a message that never actually gets sent.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 22 Apr 2009 03:02:52 +0000 (20:02 -0700)]
location: Remove unnecessary code that monitors the screen on/off state.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Scott Main [Wed, 22 Apr 2009 02:44:01 +0000 (19:44 -0700)]
AI 147325: update the installing and upgrading docs for cupcake
BUG=
1793249
Automated import of CL 147325
Scott Main [Wed, 22 Apr 2009 02:22:40 +0000 (19:22 -0700)]
AI 147314: change carousel SDK to 1.5;
revise Google IO info
BUG=
1800649
Automated import of CL 147314
Scott Main [Wed, 22 Apr 2009 02:17:59 +0000 (19:17 -0700)]
AI 147311: update eclipse docs to include necessary AVD procedures and
discuss relevant target facilities
BUG=
1796104
Automated import of CL 147311
Scott Main [Wed, 22 Apr 2009 02:09:24 +0000 (19:09 -0700)]
AI 147306: re-write the Developing in Other IDEs doc with updated information for 1.5
BUG=
1796104
Automated import of CL 147306
Dirk Dougherty [Wed, 22 Apr 2009 01:52:41 +0000 (18:52 -0700)]
AI 147297: Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
BUG=
1790234
Automated import of CL 147297
Xavier Ducrohet [Wed, 22 Apr 2009 01:48:41 +0000 (18:48 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Wed, 22 Apr 2009 01:47:18 +0000 (18:47 -0700)]
AI 147295: am: CL 147294 am: CL 147290 Update Geocoder javadoc to reflect the need for a backend service.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147295
Xavier Ducrohet [Wed, 22 Apr 2009 01:47:12 +0000 (18:47 -0700)]
AI 147294: am: CL 147290 Update Geocoder javadoc to reflect the need for a backend service.
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 147294
Xavier Ducrohet [Wed, 22 Apr 2009 01:45:32 +0000 (18:45 -0700)]
AI 147290: Update Geocoder javadoc to reflect the need for a backend service.
BUG=
1794552
Automated import of CL 147290
Android (Google) Code Review [Wed, 22 Apr 2009 00:31:01 +0000 (17:31 -0700)]
Merge change 387 into donut
* changes:
Geocoder: Document behavior when no backend service is available.
Mike Lockwood [Tue, 21 Apr 2009 23:45:33 +0000 (16:45 -0700)]
Geocoder: Document behavior when no backend service is available.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 21 Apr 2009 22:49:38 +0000 (15:49 -0700)]
gps: Check for null APN name when receiving telephony notifications.
Fixes bug b/
1800584
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jeff Hamilton [Tue, 21 Apr 2009 22:17:40 +0000 (15:17 -0700)]
Merge branch 'readonly-p4-master'
Jeff Hamilton [Tue, 21 Apr 2009 22:16:13 +0000 (15:16 -0700)]
AI 147255: am: CL 147253 am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes.
Original author: jham
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147255
Jeff Hamilton [Tue, 21 Apr 2009 22:14:41 +0000 (15:14 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jeff Hamilton [Tue, 21 Apr 2009 22:13:18 +0000 (15:13 -0700)]
AI 147253: am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes.
Original author: jham
Merged from: //branches/cupcake/...
Automated import of CL 147253
Android (Google) Code Review [Tue, 21 Apr 2009 22:12:25 +0000 (15:12 -0700)]
Merge change 372 into donut
* changes:
WifiService: Cleanup parsing of wifi scan results.
Jeff Hamilton [Tue, 21 Apr 2009 22:12:16 +0000 (15:12 -0700)]
AI 147250: Fix a nasty typo in the docs for ContentResolver.update(). No code changes.
BUG=
1067866
Automated import of CL 147250
Dirk Dougherty [Tue, 21 Apr 2009 22:04:33 +0000 (15:04 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Tue, 21 Apr 2009 22:03:07 +0000 (15:03 -0700)]
AI 147242: am: CL 147239 am: CL 147238 Update tools index, replace activitycreator with android
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147242
Dirk Dougherty [Tue, 21 Apr 2009 22:01:57 +0000 (15:01 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 22:00:34 +0000 (15:00 -0700)]
AI 147239: am: CL 147238 Update tools index, replace activitycreator with android
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147239
Dirk Dougherty [Tue, 21 Apr 2009 22:00:26 +0000 (15:00 -0700)]
AI 147238: Update tools index, replace activitycreator with android
BUG=
1790234
Automated import of CL 147238
Dirk Dougherty [Tue, 21 Apr 2009 21:57:48 +0000 (14:57 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Tue, 21 Apr 2009 21:56:21 +0000 (14:56 -0700)]
AI 147236: am: CL 147230 am: CL 147228 Add API diff report to SDK docs (API Level 2 to 3)
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147236
Dirk Dougherty [Tue, 21 Apr 2009 21:55:49 +0000 (14:55 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 21:54:32 +0000 (14:54 -0700)]
AI 147230: am: CL 147228 Add API diff report to SDK docs (API Level 2 to 3)
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147230
Dirk Dougherty [Tue, 21 Apr 2009 21:51:13 +0000 (14:51 -0700)]
AI 147228: Add API diff report to SDK docs (API Level 2 to 3)
BUG=
1790234
Automated import of CL 147228
Scott Main [Tue, 21 Apr 2009 21:30:39 +0000 (14:30 -0700)]
Merge branch 'readonly-p4-master'
Scott Main [Tue, 21 Apr 2009 21:29:14 +0000 (14:29 -0700)]
AI 147225: am: CL 147224 am: CL 147219 update app-signing doc to include a guide to export a signed APK from ADT
Original author: smain
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147225
Scott Main [Tue, 21 Apr 2009 21:28:13 +0000 (14:28 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Tue, 21 Apr 2009 21:26:59 +0000 (14:26 -0700)]
AI 147224: am: CL 147219 update app-signing doc to include a guide to export a signed APK from ADT
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 147224
Scott Main [Tue, 21 Apr 2009 21:23:52 +0000 (14:23 -0700)]
AI 147219: update app-signing doc to include a guide to export a signed APK from ADT
BUG=
1795149
Automated import of CL 147219
Dirk Dougherty [Tue, 21 Apr 2009 21:18:43 +0000 (14:18 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Tue, 21 Apr 2009 21:17:19 +0000 (14:17 -0700)]
AI 147215: am: CL 147214 am: CL 147211 Update emulator doc for new usage with avds.
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147215
Dirk Dougherty [Tue, 21 Apr 2009 21:15:40 +0000 (14:15 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 21:14:23 +0000 (14:14 -0700)]
AI 147214: am: CL 147211 Update emulator doc for new usage with avds.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147214
Dirk Dougherty [Tue, 21 Apr 2009 21:11:32 +0000 (14:11 -0700)]
AI 147211: Update emulator doc for new usage with avds.
BUG=
1790234
Automated import of CL 147211
Mike Lockwood [Tue, 21 Apr 2009 20:55:07 +0000 (13:55 -0700)]
WifiService: Cleanup parsing of wifi scan results.
Also add support for possitive RSSI values, fixing b/
1786306
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Tue, 21 Apr 2009 20:20:07 +0000 (13:20 -0700)]
Merge change 352 into donut
* changes:
Remove dangling media recorder client reference when setCamera() is used.
Android (Google) Code Review [Tue, 21 Apr 2009 19:44:57 +0000 (12:44 -0700)]
Merge change 368 into donut
* changes:
location: Add some null pointer checks.
Mike Lockwood [Tue, 21 Apr 2009 19:13:35 +0000 (12:13 -0700)]
location: Add some null pointer checks.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Andy Stadler [Tue, 21 Apr 2009 18:58:49 +0000 (11:58 -0700)]
Merge branch 'readonly-p4-master'
Andy Stadler [Tue, 21 Apr 2009 18:57:29 +0000 (11:57 -0700)]
AI 147170: am: CL 147168 am: CL 147163 Copy documentation for the various search-by-voice flags that
were already listed in attrs.xml into SearchManager.java. Add
a (brief - no time for more) description about how to add search
by voice to apps.
JAVADOC ONLY - should be safe change for cupcake sdk.
Original author: stadler
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147170
Andy Stadler [Tue, 21 Apr 2009 18:56:08 +0000 (11:56 -0700)]
Merge branch 'readonly-p4-donut' into donut
Andy Stadler [Tue, 21 Apr 2009 18:55:49 +0000 (11:55 -0700)]
Merge branch 'readonly-p4-master'