Mathias Agopian
2b1927f686
Squashed commit of the following:
...
commit e5c24638f98162c3b75b4c67a16b510d38e31341
Author: Mathias Agopian <mathias@google.com>
Date: Fri Apr 17 14:09:03 2009 -0700
oops forgot this file.
commit 282642632d0cb12882eecf42e0fdfb2343275de1
Author: Mathias Agopian <mathias@google.com>
Date: Fri Apr 17 14:07:32 2009 -0700
use a helper macro for creating Singleton<>'s static attributes instances.
2009-04-24 15:00:41 -07:00
Mathias Agopian
f670127afc
Merge commit 'goog/master' into merge_master
2009-04-24 14:24:20 -07:00
Android (Google) Code Review
d004ee1b0a
Merge change 497
...
* changes:
change the sync framework and users to understand Account
2009-04-24 12:23:57 -07:00
Cary Clark
bc2e33b5c8
don't swap out the history picture too soon
...
Wait until either the picture is not blank or
the progress is complete.
2009-04-24 10:43:02 -04:00
Fred Quintana
d9d2f1140b
change the sync framework and users to understand Account
2009-04-23 15:37:45 -07:00
Cary Clark
843bbb8597
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.
2009-04-23 10:40:28 -04:00
Android (Google) Code Review
b4bf562022
Merge change 431
...
* changes:
package run_page_cycler.py into apk and add code for extraction
2009-04-22 18:51:09 -07:00
Jean-Baptiste Queru
b843ce7424
Merge donut into master
2009-04-22 18:33:17 -07:00
Jean-Baptiste Queru
0029326391
Merge donut into master
2009-04-22 18:27:14 -07:00
Jean-Baptiste Queru
56137a2584
merge cupcake into donut
2009-04-22 17:56:58 -07:00
Jean-Baptiste Queru
b73b4c73d5
Regenerate current.xml after merge
2009-04-22 17:28:41 -07:00
Jean-Baptiste Queru
74008f608a
Merge donut into master
2009-04-22 17:12:34 -07:00
Android (Google) Code Review
2d6b6b2568
Merge change 289 into donut
...
* changes:
Changes for new ril.h.
2009-04-22 16:44:52 -07:00
Wink Saville
a14f47f975
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.
2009-04-22 14:52:11 -07:00
Dirk Dougherty
644cf62660
Merge branch 'readonly-p4-donut' into donut
2009-04-22 13:39:58 -07:00
Dirk Dougherty
b08971b876
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
2009-04-22 13:38:45 -07:00
Dirk Dougherty
b6f8704116
Merge branch 'readonly-p4-donut' into donut
2009-04-22 13:37:15 -07:00
Dirk Dougherty
8ad72ec1cb
AI 147334: am: CL 147332 Miscellaneous doc changes for cupcake SDK
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147334
2009-04-22 13:35:59 -07:00
Scott Main
79282c867b
Merge branch 'readonly-p4-donut' into donut
2009-04-22 13:34:31 -07:00
Scott Main
757714fd15
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
2009-04-22 13:33:18 -07:00
Scott Main
680974e363
Merge branch 'readonly-p4-donut' into donut
2009-04-22 13:28:57 -07:00
Scott Main
9077708767
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
2009-04-22 13:27:42 -07:00
Scott Main
003f213bdf
Merge branch 'readonly-p4-donut' into donut
2009-04-22 13:26:11 -07:00
Scott Main
3aa6511539
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
2009-04-22 13:24:58 -07:00
Scott Main
823ce5e1b6
Merge branch 'readonly-p4-donut' into donut
2009-04-22 13:23:29 -07:00
Scott Main
5ac35ad03f
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
2009-04-22 13:22:17 -07:00
Dirk Dougherty
7a7e3f68f6
Merge branch 'readonly-p4-donut' into donut
2009-04-22 13:20:44 -07:00
Dirk Dougherty
9db5e1d0ab
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
2009-04-22 13:19:30 -07:00
Eric Fischer
a4f01520b9
AI 147406: Import revised translations.
...
Automated import of CL 147406
2009-04-22 12:33:55 -07:00
Jean-Baptiste Queru
cddff7c3ce
Merge commit 'goog/readonly-p4-donut' into HEAD
...
Conflicts:
location/java/android/location/Geocoder.java
2009-04-22 12:09:59 -07:00
Guang Zhu
309f464807
package run_page_cycler.py into apk and add code for extraction
2009-04-22 10:47:44 -07:00
Marco Nelissen
9f0b1a4850
Do case-insensitive matching when determining whether something is music, an alarm sound, notification sound, etc.
2009-04-22 10:34:12 -07:00
Android (Google) Code Review
c9a3b66d27
Merge change 358 into donut
...
* changes:
Fix issue 1745312: Various cleanups in media framework
2009-04-22 09:57:03 -07:00
Android (Google) Code Review
44ff0514c2
Merge change 416 into donut
...
* changes:
Remove debug messages. modified: core/java/android/hardware/Camera.java
2009-04-22 01:59:31 -07:00
Wu-cheng Li
ab5b424db3
Remove debug messages.
...
modified: core/java/android/hardware/Camera.java
modified: camera/libcameraservice/CameraService.cpp
2009-04-22 16:22:01 +08:00
Dirk Dougherty
6fc52c4928
Merge branch 'readonly-p4-master'
2009-04-22 01:08:00 -07:00
Dirk Dougherty
7fd4e44828
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
2009-04-22 01:06:41 -07:00
Dirk Dougherty
4f7edaed3a
Merge branch 'readonly-p4-master'
2009-04-22 01:05:08 -07:00
Dirk Dougherty
8aef7a7a0a
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
2009-04-22 01:03:47 -07:00
Scott Main
08f97d90e8
Merge branch 'readonly-p4-master'
2009-04-22 01:02:14 -07:00
Scott Main
4b0d2f61f0
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
2009-04-22 01:00:55 -07:00
Scott Main
fb9670c8a3
Merge branch 'readonly-p4-master'
2009-04-22 00:56:26 -07:00
Scott Main
0af345c3b8
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
2009-04-22 00:55:10 -07:00
Scott Main
9d93534d41
Merge branch 'readonly-p4-master'
2009-04-22 00:53:37 -07:00
Scott Main
d108c3003b
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
2009-04-22 00:52:20 -07:00
Scott Main
641eb5640b
Merge branch 'readonly-p4-master'
2009-04-22 00:50:50 -07:00
Scott Main
4ec36bb041
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
2009-04-22 00:49:29 -07:00
Dirk Dougherty
903d5bb3f0
Merge branch 'readonly-p4-master'
2009-04-22 00:47:58 -07:00
Dirk Dougherty
1876edb291
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
2009-04-22 00:46:36 -07:00
Android (Google) Code Review
58d8a0bb73
Merge change 404 into donut
...
* changes:
normalize the DATA_STATE_RADIO_OFF event log id definition
2009-04-21 23:44:04 -07:00