10906 Commits

Author SHA1 Message Date
Costin Manolache
d153ea28e0 am 264f9b45: am 3348f14b: Remove GAIA string
Merge commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376'

* commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376':
  Remove GAIA string
2009-10-01 11:51:16 -07:00
Mike Cleron
a8b2d463b8 am 90183823: am b4ee8349: Merge change I290947bb into eclair
Merge commit '90183823b00ad5ce04948cf03d827a47c82ca445'

* commit '90183823b00ad5ce04948cf03d827a47c82ca445':
  Git sucks
2009-10-01 11:50:07 -07:00
Yu Shan Emily Lau
f2496dc8b9 am f1fa1eac: am edd942c2: Merge change I55a6ac8c into eclair
Merge commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11'

* commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11':
  Fixed the long recorder time and reduce the number of loops.
2009-10-01 11:49:46 -07:00
Debajit Ghosh
2117e2056e am ebefded1: am 2a35c8d7: Merge change I96cb8d0b into eclair
Merge commit 'ebefded1ccbd13f190aa4c5f4e3590e5ac8f2a6d'

* commit 'ebefded1ccbd13f190aa4c5f4e3590e5ac8f2a6d':
  fix account permission strings.  this permission is used to protect more than just Google accounts.
2009-10-01 11:49:34 -07:00
Dan Egnor
c2c055586e am 5495ee0c: am b1b289a0: Merge change Id6688603 into eclair
Merge commit '5495ee0c09661b44ecec095e111b9564e356e272'

* commit '5495ee0c09661b44ecec095e111b9564e356e272':
  Better event log tracking for initializeDevice() requests --
2009-10-01 11:48:22 -07:00
Mike LeBeau
7b86961d45 am 6cf9ab65: am 2e4dbe70: Unhide APIs for enabling geolocation in web views. I\'ve confirmed with Grace that these are okay to unhide.
Merge commit '6cf9ab65888265aa87139694ed94ba0830b54707'

* commit '6cf9ab65888265aa87139694ed94ba0830b54707':
  Unhide APIs for enabling geolocation in web views. I've confirmed
2009-10-01 11:47:43 -07:00
Jim Miller
a48fb8aa68 am 11cc925e: am a4c96aa2: Merge change I88bb16e6 into eclair
Merge commit '11cc925efbe582d617ffd01894f920f9a675adc3'

* commit '11cc925efbe582d617ffd01894f920f9a675adc3':
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
2009-10-01 11:46:25 -07:00
Xavier Ducrohet
cc8f6eafc3 am 8167d8d8: am dd49055a: am ac18e4f2: Update 4.xml with the native status change of breakText/measureText
Merge commit '8167d8d874289c8adf5fbad1ff0790173d7616c1'

* commit '8167d8d874289c8adf5fbad1ff0790173d7616c1':
  Update 4.xml with the native status change of breakText/measureText
2009-10-01 11:46:14 -07:00
Dianne Hackborn
d4a4462f55 am 844d6f9e: (-s ours) am 989384b2: am e67f0c97: (-s ours) Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
Merge commit '844d6f9ef0aec65df51ab3f3a9960e2611783722'

* commit '844d6f9ef0aec65df51ab3f3a9960e2611783722':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
2009-10-01 11:46:05 -07:00
Dianne Hackborn
cb5b60ed83 am a8dcc654: (-s ours) am e5faf231: am d135b093: (-s ours) Fix broken build. (do not merge)
Merge commit 'a8dcc654a5e77097eefefc66bbb18c9c354035f8'

* commit 'a8dcc654a5e77097eefefc66bbb18c9c354035f8':
  Fix broken build. (do not merge)
2009-10-01 11:45:54 -07:00
Xavier Ducrohet
ea33da7e8f am e9772f92: am c9c834f9: am 08905850: (-s ours) Merge change I499f8819 into donut
Merge commit 'e9772f92c719760321324e83a324619c8e080054'

* commit 'e9772f92c719760321324e83a324619c8e080054':
  Add density support to layoutlib so that bitmap are scaled if needed.
2009-10-01 11:45:40 -07:00
Xavier Ducrohet
a862dd2371 am afbf5638: am 3e211b56: am f05f92a2: (-s ours) Merge change Id16e0e13 into donut
Merge commit 'afbf5638ced937d676c0b3a63f707fc125395e4b'

* commit 'afbf5638ced937d676c0b3a63f707fc125395e4b':
  Add density value to density enum.
2009-10-01 11:45:30 -07:00
Xavier Ducrohet
3019301a38 am ad5f2565: am 19ea1354: am 59b30f69: (-s ours) Merge change Ia4e59dbb into donut
Merge commit 'ad5f25656664c843828f55ca5f229cebcfd5af86'

* commit 'ad5f25656664c843828f55ca5f229cebcfd5af86':
  Add a new IResourceValue that knows about the density.
2009-10-01 11:45:21 -07:00
Wu-cheng Li
42a7e790dd am 0ce5a41c: am 8d1ff3a4: Merge change I77153ee0 into eclair
Merge commit '0ce5a41c6074f40800dfcb5c48de0abef41f9833'

* commit '0ce5a41c6074f40800dfcb5c48de0abef41f9833':
  Hide zoom api.
2009-10-01 11:43:43 -07:00
Romain Guy
55b41ab3b4 am 3ca99e20: am 91c6bdd2: Merge change I2e069577 into eclair
Merge commit '3ca99e20c551022d4a3b3bc176e43bd733efdc21'

* commit '3ca99e20c551022d4a3b3bc176e43bd733efdc21':
  Simplify the layout of all activities with a title and a progress bar.
2009-10-01 11:43:13 -07:00
Christopher Tate
a3dc4bbbcb am 450a60f8: am 072c9e74: Merge change I52e20bac into eclair
Merge commit '450a60f8eca9308e23dcdd1c38c8ff8726b7b3c4'

* commit '450a60f8eca9308e23dcdd1c38c8ff8726b7b3c4':
  Add more useful-for-debug info to 'dumpsys backup'
2009-10-01 11:43:03 -07:00
Romain Guy
9aadf9dece am 03fa3eda: am 92f0370c: Merge change Id43181f2 into eclair
Merge commit '03fa3eda491a6cc9d51dd2de8706050ae5bad805'

* commit '03fa3eda491a6cc9d51dd2de8706050ae5bad805':
  Fix disabled text color in choice dialogs.
2009-10-01 11:42:52 -07:00
Chih-Chung Chang
1c628eba63 am 41293323: am 8bbba0e3: Merge change If5722b3f into eclair
Merge commit '412933234ad114c0fbb237f068b07821afb6e484'

* commit '412933234ad114c0fbb237f068b07821afb6e484':
  Dont NPE if the thumbnail file cannot be opened.
2009-10-01 11:42:27 -07:00
Guang Zhu
fb623d873a am fde37e5b: am 277a41a7: Merge change Ia0609a0d into eclair
Merge commit 'fde37e5b40e2f4da07829d0dfad97db0be681a70'

* commit 'fde37e5b40e2f4da07829d0dfad97db0be681a70':
  rebase layout test result as the numbers reported are much more stable now
2009-10-01 11:42:01 -07:00
Christopher Tate
affc36905a am 57a924d3: am 49de6949: Merge change Ia75da053 into eclair
Merge commit '57a924d3eaf1ce2a31ef444639f9d6f490b34352'

* commit '57a924d3eaf1ce2a31ef444639f9d6f490b34352':
  Remove DEBUG-only logging in metadata backup agent
2009-10-01 11:41:41 -07:00
Evan Millar
55a0cd658a am a7155663: am c4e20e9e: Merge change Iae12c7f0 into eclair
Merge commit 'a715566313f192e3c447d1cea351c7e4ad49789a'

* commit 'a715566313f192e3c447d1cea351c7e4ad49789a':
  Add REQUESTING_PACKAGE_PARAM_KEY.
2009-10-01 11:41:15 -07:00
Naveen Kalla
1eb9c6b1db am 79fc6560: am 6189fd98: Merge change I27d074e0 into eclair
Merge commit '79fc65605d95dfb26ad6c9bf7024fc429b3e6ff8'

* commit '79fc65605d95dfb26ad6c9bf7024fc429b3e6ff8':
  Telephony: Add a failure cause for CDMA call failures and rename
2009-10-01 11:40:53 -07:00
Jim Miller
0e08e9f7fa am 10abe7f3: am 98747715: Merge change I88614e93 into eclair
Merge commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50'

* commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50':
  Fix for 2137900: Be more conservative about poking the wakelock.
2009-10-01 11:40:43 -07:00
Romain Guy
f36c579279 am de63adcc: am 8eb0f348: Merge change I67285c9a into eclair
Merge commit 'de63adcc2679b75ab5a9fbee7c36338ae1f98afd'

* commit 'de63adcc2679b75ab5a9fbee7c36338ae1f98afd':
  Prevent NPE when doing a fillSpecific layout.
2009-10-01 11:39:41 -07:00
lknguyen
385fac09b9 am ed7f8831: am de04cb81: Merge change Ie9f76062 into eclair
Merge commit 'ed7f883187f8f6c6dfd240412523a911f616b688'

* commit 'ed7f883187f8f6c6dfd240412523a911f616b688':
  Add Gservices flag for Vending doctor download complete timeout.
2009-10-01 11:39:28 -07:00
Eric Laurent
f4a764bf08 am efc42d3a: am 7d987180: Merge change I19f2928b into eclair
Merge commit 'efc42d3a5bff6b58b3439b50f318f43c7c1ea1ad'

* commit 'efc42d3a5bff6b58b3439b50f318f43c7c1ea1ad':
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-10-01 11:39:08 -07:00
Romain Guy
1597cf3ece am 0f320745: am b80fbd44: Merge change I24cf40af into eclair
Merge commit '0f3207455a05017057e94e3a19a81b685e6d32b3'

* commit '0f3207455a05017057e94e3a19a81b685e6d32b3':
  New assets for the status and title bars.
2009-10-01 11:38:58 -07:00
Dianne Hackborn
d06b6c5e7c am 356c58c5: am dc994dae: am 1d0086d9: Fix issue #2125720 Weather Forecast Widget - graphics do not scale
Merge commit '356c58c5b9044ddef83320bde5a78b988f42d2e8'

* commit '356c58c5b9044ddef83320bde5a78b988f42d2e8':
  Fix issue #2125720 Weather Forecast Widget - graphics do not scale
2009-10-01 11:37:39 -07:00
Dianne Hackborn
e33ca71f38 am 0c5d2b81: am 57e31eff: am b91024c1: Fix #2101821: Cut labels of menu items in "SnapTell" market app.
Merge commit '0c5d2b81e258d350a066fe07898d96feec977b9e'

* commit '0c5d2b81e258d350a066fe07898d96feec977b9e':
  Fix #2101821: Cut labels of menu items in "SnapTell" market app.
2009-10-01 11:37:29 -07:00
Daisuke Miyakawa
7aa7084bbc am 9e2421a3: am a39f9188: Merge change I9c45753b into eclair
Merge commit '9e2421a3a3b22119a65665c7825de08ee5c5697b'

* commit '9e2421a3a3b22119a65665c7825de08ee5c5697b':
  Clean up vCard code.
2009-10-01 11:36:59 -07:00
Jason Parks
094d8f4045 am bc82ea5d: am ac35dc47: Merge change I1cd7d0e5 into eclair
Merge commit 'bc82ea5d441fa37029c4260c74ee0ed4bd1402ac'

* commit 'bc82ea5d441fa37029c4260c74ee0ed4bd1402ac':
  Implement the checkin option in AccountManagerService.dump()
2009-10-01 11:36:49 -07:00
Mark Wagner
fbccf1f41d am 10662ae7: am d35afcda: Merge change Ib2c6429d into eclair
Merge commit '10662ae78f8900e28f13f6abdeee002c25b8c18d'

* commit '10662ae78f8900e28f13f6abdeee002c25b8c18d':
  border for the non-badge case
2009-10-01 11:36:38 -07:00
Daniel Sandler
b9111246b2 am 9b19bfa1: am c78b2bf4: Merge change I905b03af into eclair
Merge commit '9b19bfa1b5061da19a73fb65c8c1afa0f1a9ede1'

* commit '9b19bfa1b5061da19a73fb65c8c1afa0f1a9ede1':
  New hdpi assets for framework.
2009-10-01 11:36:16 -07:00
James Dong
e8b93da7f7 am b8bf70ac: am 4c232c5b: Merge change Idd16976f into eclair
Merge commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2'

* commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2':
  Fix some metadata retriever issues:
2009-10-01 11:35:55 -07:00
Robert Greenwalt
95c9da3952 am fa62a047: am ab18206e: Merge change Ifc9dd5c6 into eclair
Merge commit 'fa62a0478e40c1730c04a417cf9ec4fa5d1991e5'

* commit 'fa62a0478e40c1730c04a417cf9ec4fa5d1991e5':
  Fix the reporting of ActiveApnTypes on CDMA
2009-10-01 11:35:45 -07:00
Ray Chen
6dd52bbf2d am 06e5b766: am 0167263b: Merge change Ide90d0cc into eclair
Merge commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477'

* commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477':
  Unify Java NIO to read/write MiniThumbFile.
2009-10-01 11:35:35 -07:00
Cary Clark
5e56933a10 am dfab8b68: am 4fbf81bc: check for null item in web history in saveState
Merge commit 'dfab8b687039ef764249c22c00d0b030c55067da'

* commit 'dfab8b687039ef764249c22c00d0b030c55067da':
  check for null item in web history in saveState
2009-10-01 11:35:23 -07:00
Romain Guy
01a6ac5d3a am 75ef5234: am bd5b5722: absf() -> fabsf() instead of fabs()
Merge commit '75ef5234658a37b6e710bbc92c25e62b9a5cd4dd'

* commit '75ef5234658a37b6e710bbc92c25e62b9a5cd4dd':
  absf() -> fabsf() instead of fabs()
2009-10-01 11:34:34 -07:00
Mike Cleron
a60a1ef869 am 03ecab42: am 7957eaa6: Merge change Iee9b30d3 into eclair
Merge commit '03ecab425235bdb5e3548900284e8089c3d72e5e'

* commit '03ecab425235bdb5e3548900284e8089c3d72e5e':
  New icons
2009-10-01 11:34:19 -07:00
Cary Clark
05bcbd6280 am ed843820: am eaa18dec: scroll text field with touch
Merge commit 'ed843820f7aa93e0d3a2529956414a2ed940fa89'

* commit 'ed843820f7aa93e0d3a2529956414a2ed940fa89':
  scroll text field with touch
2009-10-01 11:33:08 -07:00
Jeff Hamilton
2e2d8e92a0 am 11bb09c3: am f993fefc: Merge change Icbd74742 into eclair
Merge commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3'

* commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3':
  EventLog when a database file is deleted due to corruption.
2009-10-01 11:19:08 -07:00
Dianne Hackborn
170e05589a am 2ed31083: am 87937ae8: Merge change I66057b1f into eclair
Merge commit '2ed31083a29095deea09c8e974a4dee0b85b3a3f'

* commit '2ed31083a29095deea09c8e974a4dee0b85b3a3f':
  Whoops, these shouldn't be public.
2009-10-01 11:18:57 -07:00
Leon Scroggins
d809c7dcd7 am a4f2ac7e: am d84e7d53: Allow scrolls to continue when getting a new content size.
Merge commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c'

* commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c':
  Allow scrolls to continue when getting a new content size.
2009-10-01 11:18:05 -07:00
Dianne Hackborn
6b4bad55af am 253f8362: am fff0b4a6: Fix build.
Merge commit '253f836277ccaaae16342ff4379ca59746216536'

* commit '253f836277ccaaae16342ff4379ca59746216536':
  Fix build.
2009-10-01 11:17:18 -07:00
Dianne Hackborn
93869c19aa am aed86520: am b6eaaa2a: Clean up cacheColorHint to be better controlled by the theme.
Merge commit 'aed865207f7425f6c4d0538decb04109c415410d'

* commit 'aed865207f7425f6c4d0538decb04109c415410d':
  Clean up cacheColorHint to be better controlled by the theme.
2009-10-01 11:16:40 -07:00
Dianne Hackborn
a085d5e747 am 0b03fa8b: am 490d5222: Merge change I6cacaa0d into eclair
Merge commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad'

* commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair
2009-10-01 11:16:09 -07:00
Evan Millar
3ab151e6d9 am c14b3285: am 22cbf51e: Merge change I49fbfc68 into eclair
Merge commit 'c14b32855b6e4338a4832872870f3373d7c2d691'

* commit 'c14b32855b6e4338a4832872870f3373d7c2d691':
  Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
2009-10-01 11:15:57 -07:00
John Wang
43d536a6f4 am 8658eaba: am ac5bd144: Merge change Ib23e57cf into eclair
Merge commit '8658eaba1e4ab109b6dc9d854c57d80d74e9f61e'

* commit '8658eaba1e4ab109b6dc9d854c57d80d74e9f61e':
  Set roaming based on both data and voice.
2009-10-01 11:15:47 -07:00
Dirk Dougherty
ee06b671b2 am 5f9be939: am b0702880: am 50128088: Merge change I915efc49 into donut
Merge commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1'

* commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1':
  Update docs for NDK.
2009-10-01 11:15:10 -07:00
Dirk Dougherty
ae7d0d4455 am a6c2740d: am e34569fa: am bc0e07bf: Merge change I7b64ad2e into donut
Merge commit 'a6c2740d695cfb95cf1cd3989cb292d4c2fe1049'

* commit 'a6c2740d695cfb95cf1cd3989cb292d4c2fe1049':
  doc change only. fix toc links on terms page.
2009-10-01 11:14:59 -07:00