Guang Zhu
b44740c8fa
am 89668bd2: Merge change 22208 into eclair
...
Merge commit '89668bd25e78dcae302a8815c756f3024f75643d'
* commit '89668bd25e78dcae302a8815c756f3024f75643d':
Fixed the missing EOL in last line of crashed tests list file. Also fixed some whitespaces.
2009-08-20 18:26:25 -07:00
Android (Google) Code Review
89668bd25e
Merge change 22208 into eclair
...
* changes:
Fixed the missing EOL in last line of crashed tests list file. Also fixed some whitespaces.
2009-08-20 18:22:07 -07:00
Guang Zhu
5080b6736e
Fixed the missing EOL in last line of crashed tests list file. Also fixed some whitespaces.
2009-08-20 18:20:46 -07:00
Jason Sams
8b0b85aedb
am 41ceb907: Merge change 22186 into eclair
...
Merge commit '41ceb907b5d13ee58759022ac8d830b04686baba'
* commit '41ceb907b5d13ee58759022ac8d830b04686baba':
Allow null to be re-bound as a root script. This was always legal from native and just a limitation of the java binding for the API.
2009-08-20 17:28:19 -07:00
Android (Google) Code Review
41ceb907b5
Merge change 22186 into eclair
...
* changes:
Allow null to be re-bound as a root script. This was always legal from native and just a limitation of the java binding for the API.
2009-08-20 17:24:52 -07:00
Jason Sams
d8e4161f11
Allow null to be re-bound as a root script. This was always legal from native and just a limitation of the java binding for the API.
2009-08-20 17:22:40 -07:00
Evan Millar
48b3540e6b
am 9468f800: Merge change 22086 into eclair
...
Merge commit '9468f8006d56789cb8912459dd3e899529995297'
* commit '9468f8006d56789cb8912459dd3e899529995297':
Tweak the ContactsHeaderWidget to match the newest specs.
2009-08-20 17:16:40 -07:00
Android (Google) Code Review
9468f8006d
Merge change 22086 into eclair
...
* changes:
Tweak the ContactsHeaderWidget to match the newest specs.
2009-08-20 17:12:43 -07:00
Romain Guy
662d05364e
am 75e6c771: Merge change 22169 into eclair
...
Merge commit '75e6c77139dac6bc8f408e3e3a1c87bbfe8078be'
* commit '75e6c77139dac6bc8f408e3e3a1c87bbfe8078be':
Cleanup the Galaxy, add a few RS functions for Grass.
2009-08-20 17:12:19 -07:00
Jason Sams
f0e50f12eb
am d57ca2de: Merge change 22163 into eclair
...
Merge commit 'd57ca2deff2a3d7e346043d39d9245a578b691a2'
* commit 'd57ca2deff2a3d7e346043d39d9245a578b691a2':
Point Sprites
2009-08-20 17:12:17 -07:00
Android (Google) Code Review
75e6c77139
Merge change 22169 into eclair
...
* changes:
Cleanup the Galaxy, add a few RS functions for Grass.
2009-08-20 17:08:54 -07:00
Romain Guy
d22fff7185
Cleanup the Galaxy, add a few RS functions for Grass.
2009-08-20 17:08:33 -07:00
Android (Google) Code Review
d57ca2deff
Merge change 22163 into eclair
...
* changes:
Point Sprites
2009-08-20 16:53:25 -07:00
Amith Yamasani
21af9cc3d5
am 4e297203: Merge change 22154 into eclair
...
Merge commit '4e297203ec2f44dcce58bbe4c3600a08f8a322ea'
* commit '4e297203ec2f44dcce58bbe4c3600a08f8a322ea':
Fix fastscroll overlay size on WVGA by using dip.
2009-08-20 16:52:46 -07:00
Android (Google) Code Review
4e297203ec
Merge change 22154 into eclair
...
* changes:
Fix fastscroll overlay size on WVGA by using dip.
2009-08-20 16:49:25 -07:00
Amith Yamasani
1ffaebc41b
Fix fastscroll overlay size on WVGA by using dip.
...
Move constant dimensions to resources.
2009-08-20 16:15:46 -07:00
Jason Sams
25ffcdc9d7
Point Sprites
2009-08-20 16:11:03 -07:00
Eric Fischer
227f0b58e8
am ac81c429: (-s ours) am b7aec912: (-s ours) Import revised translations. DO NOT MERGE
...
Merge commit 'ac81c42971ddcd0726c4f2050fd82942914d0e1c'
* commit 'ac81c42971ddcd0726c4f2050fd82942914d0e1c':
Import revised translations. DO NOT MERGE
2009-08-20 16:06:19 -07:00
Scott Main
aadd44e18a
am a10f45ef: (-s ours) am 185d74ba: Merge change 21977 into donut
...
Merge commit 'a10f45efbc400ccd241c34c5c6d52c3982baf3ae'
* commit 'a10f45efbc400ccd241c34c5c6d52c3982baf3ae':
docs only.
2009-08-20 16:06:17 -07:00
Eric Fischer
ac81c42971
am b7aec912: (-s ours) Import revised translations. DO NOT MERGE
...
Merge commit 'b7aec9124a44c60509c00f1d306fd08860d6197c' into eclair
* commit 'b7aec9124a44c60509c00f1d306fd08860d6197c':
Import revised translations. DO NOT MERGE
2009-08-20 16:00:45 -07:00
Scott Main
a10f45efbc
am 185d74ba: Merge change 21977 into donut
...
Merge commit '185d74ba56ccaca3f4bb105d00562bcd5a82c788' into eclair
* commit '185d74ba56ccaca3f4bb105d00562bcd5a82c788':
docs only.
2009-08-20 16:00:41 -07:00
Andreas Huber
45589df5c9
am 78a0a37b: Merge change 22144 into eclair
...
Merge commit '78a0a37b23ae438fa81855e52e625a04befe6dec'
* commit '78a0a37b23ae438fa81855e52e625a04befe6dec':
Enable specification of http:// urls in stagefright commandline tool.
2009-08-20 15:58:46 -07:00
Android (Google) Code Review
78a0a37b23
Merge change 22144 into eclair
...
* changes:
Enable specification of http:// urls in stagefright commandline tool.
2009-08-20 15:55:59 -07:00
Andreas Huber
96774d9ca9
Enable specification of http:// urls in stagefright commandline tool.
2009-08-20 15:35:39 -07:00
Fred Quintana
511acd5afa
am 404780d6: Merge change 22132 into eclair
...
Merge commit '404780d62b8f6fe6787fca27cf36fe2c20b7220e'
* commit '404780d62b8f6fe6787fca27cf36fe2c20b7220e':
build fix
2009-08-20 15:12:25 -07:00
Marco Nelissen
bd05b00fa1
am 01549b21: Merge change 22008 into eclair
...
Merge commit '01549b21c42e10dc83d00cf857130d10e665de2e'
* commit '01549b21c42e10dc83d00cf857130d10e665de2e':
When bringing up the media controller view, focus the play/pause button.
2009-08-20 15:12:22 -07:00
Android (Google) Code Review
404780d62b
Merge change 22132 into eclair
...
* changes:
build fix
2009-08-20 15:09:04 -07:00
Android (Google) Code Review
01549b21c4
Merge change 22008 into eclair
...
* changes:
When bringing up the media controller view, focus the play/pause button.
2009-08-20 15:08:36 -07:00
Fred Quintana
8ada1c438a
build fix
2009-08-20 15:08:08 -07:00
Tammo Spalink
00fe3e79cc
am bb7362c3: Merge change 22127 into eclair
...
Merge commit 'bb7362c3b08a121eec12f12989e76101fa71d68b'
* commit 'bb7362c3b08a121eec12f12989e76101fa71d68b':
more cdma sms debug logging
2009-08-20 14:45:38 -07:00
Android (Google) Code Review
bb7362c3b0
Merge change 22127 into eclair
...
* changes:
more cdma sms debug logging
2009-08-20 14:43:17 -07:00
Tammo Spalink
49bd918dc2
more cdma sms debug logging
2009-08-20 14:40:29 -07:00
Fred Quintana
9947052698
am 58b6d1be: build fix
...
Merge commit '58b6d1be26bd015b0da9336e82a83fd2cf303d2a'
* commit '58b6d1be26bd015b0da9336e82a83fd2cf303d2a':
build fix
2009-08-20 14:29:56 -07:00
Fred Quintana
58b6d1be26
build fix
2009-08-20 14:24:36 -07:00
Eric Fischer
b7aec9124a
Import revised translations. DO NOT MERGE
2009-08-20 14:07:18 -07:00
Andreas Huber
861be56d4e
am cc4f3424: Merge change 22092 into eclair
...
Merge commit 'cc4f3424e5b5227d0711ae7d3850a8b903c15a07'
* commit 'cc4f3424e5b5227d0711ae7d3850a8b903c15a07':
Dynamically allocate a pair of MemoryHeaps according buffer count/sizes required by the OMX component, respect JPEG compressed size.
2009-08-20 14:00:34 -07:00
Android (Google) Code Review
cc4f3424e5
Merge change 22092 into eclair
...
* changes:
Dynamically allocate a pair of MemoryHeaps according buffer count/sizes required by the OMX component, respect JPEG compressed size.
2009-08-20 13:58:17 -07:00
Fred Quintana
0858ec8453
am e0616ffb: add a supportsUploading flag in the SyncAdapter description and honor it in the SyncManager
...
Merge commit 'e0616ffb741b64e3bc7a1e3ad9def3d50eee53fd'
* commit 'e0616ffb741b64e3bc7a1e3ad9def3d50eee53fd':
add a supportsUploading flag in the SyncAdapter description and honor it in the SyncManager
2009-08-20 13:55:54 -07:00
Fred Quintana
e0616ffb74
add a supportsUploading flag in the SyncAdapter description and honor it in the SyncManager
2009-08-20 13:52:22 -07:00
Ken Shirriff
e561910c3d
am 9e61acd9: Merge change 22105 into eclair
...
Merge commit '9e61acd9ff267fe9fdbcd130905bdd63ff70db3a'
* commit '9e61acd9ff267fe9fdbcd130905bdd63ff70db3a':
Add calendar sliding windows setting.
2009-08-20 13:49:32 -07:00
Android (Google) Code Review
9e61acd9ff
Merge change 22105 into eclair
...
* changes:
Add calendar sliding windows setting.
2009-08-20 13:46:06 -07:00
Tammo Spalink
cb99dc7183
am 6d494f9c: Merge change 22093 into eclair
...
Merge commit '6d494f9c88084a10e9ba835508b58a139fc74bd3'
* commit '6d494f9c88084a10e9ba835508b58a139fc74bd3':
cdma sms encoding tweaks and logging / debugging annotations.
2009-08-20 13:25:03 -07:00
Android (Google) Code Review
6d494f9c88
Merge change 22093 into eclair
...
* changes:
cdma sms encoding tweaks and logging / debugging annotations.
2009-08-20 13:22:12 -07:00
Ken Shirriff
f0f13aeadd
Add calendar sliding windows setting.
...
GOOGLE_CALENDAR_SYNC_WINDOW_UPDATE_DAYS indicates how often to update
the calendar sync window.
2009-08-20 13:19:14 -07:00
Daniel Sandler
9a2b2775cc
am 05b11cd7: Merge change 22082 into eclair
...
Merge commit '05b11cd7cce4c6a85438899da57210394d1f6ef8'
* commit '05b11cd7cce4c6a85438899da57210394d1f6ef8':
Address b/2064664 by setting mThumbOffset to half the width of the thumb by default.
2009-08-20 12:25:56 -07:00
Android (Google) Code Review
05b11cd7cc
Merge change 22082 into eclair
...
* changes:
Address b/2064664 by setting mThumbOffset to half the width of the thumb by default.
2009-08-20 12:22:08 -07:00
Benny Wong
0817482149
am ba377496: Merge change 22066 into eclair
...
Merge commit 'ba377496347e29aeca1540d51b150eebc2634ad6'
* commit 'ba377496347e29aeca1540d51b150eebc2634ad6':
Add offset handling in MemoryHeapBase class
2009-08-20 12:09:31 -07:00
Android (Google) Code Review
ba37749634
Merge change 22066 into eclair
...
* changes:
Add offset handling in MemoryHeapBase class
2009-08-20 12:06:54 -07:00
Mathias Agopian
23850ca1c6
am dd8cb62b: Merge change 22060 into eclair
...
Merge commit 'dd8cb62bdf48ec0096c0ed665996a25320d477e2'
* commit 'dd8cb62bdf48ec0096c0ed665996a25320d477e2':
better error handling in EGL
2009-08-20 11:57:09 -07:00
Android (Google) Code Review
dd8cb62bdf
Merge change 22060 into eclair
...
* changes:
better error handling in EGL
2009-08-20 11:52:39 -07:00