Commit Graph

6822 Commits

Author SHA1 Message Date
Dan Egnor
d8f9d280ae am ddf157ca: Merge change I5ae73af7 into eclair
Merge commit 'ddf157cae48a17e72e740538a981a63394ec2274' into eclair-plus-aosp

* commit 'ddf157cae48a17e72e740538a981a63394ec2274':
  Don't back up system wallpapers.
2009-11-12 09:59:52 -08:00
Android (Google) Code Review
4540b9834d Merge change I5ae73af7 into eclair
* changes:
  Don't back up system wallpapers.
2009-11-12 09:52:10 -08:00
Jaikumar Ganesh
8b8fa685c9 am 3c58d279: Merge change I738ed802 into eclair
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-plus-aosp

* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
  Fix BMW and Audi auto pairing lists.
2009-11-11 23:31:14 -08:00
Android (Google) Code Review
07acbc31c6 Merge change I738ed802 into eclair
* changes:
  Fix BMW and Audi auto pairing lists.
2009-11-11 23:27:03 -08:00
Dianne Hackborn
bd8130ee0a am 34d723d8: Merge change I32371166 into eclair
Merge commit '34d723d8fa75e8f97401311e03b3839246143018' into eclair-plus-aosp

* commit '34d723d8fa75e8f97401311e03b3839246143018':
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
2009-11-11 23:12:18 -08:00
Android (Google) Code Review
2e8d355eeb Merge change I32371166 into eclair
* changes:
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
2009-11-11 23:10:06 -08:00
Jim Miller
631cb54c5d am 2ba297d1: Merge change I9890c2d4 into eclair
Merge commit '2ba297d19e101ab3c6456aa7813a043d66c572b6' into eclair-plus-aosp

* commit '2ba297d19e101ab3c6456aa7813a043d66c572b6':
  Fix 2209086: Fix landscape layout of LockScreen on devices with a keyboard
2009-11-11 23:08:14 -08:00
Android (Google) Code Review
671fed2cbe Merge change I9890c2d4 into eclair
* changes:
  Fix 2209086: Fix landscape layout of LockScreen on devices with a keyboard
2009-11-11 23:04:47 -08:00
Jaikumar Ganesh
f650bba322 am 013b0e53: Merge change I143ea844 into eclair
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-plus-aosp

* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
  Add BMW and Audi to Auto Pairing black list.
2009-11-11 22:49:48 -08:00
Android (Google) Code Review
4683d56259 Merge change I143ea844 into eclair
* changes:
  Add BMW and Audi to Auto Pairing black list.
2009-11-11 22:46:49 -08:00
Dianne Hackborn
69f8486a51 am 360d710e: Merge change I580de484 into eclair
Merge commit '360d710ebccc2a2b53bf6233e722d3287d585476' into eclair-plus-aosp

* commit '360d710ebccc2a2b53bf6233e722d3287d585476':
  Fix issue #2256270: Package manager sends bad broadcasts when components change
2009-11-11 20:25:08 -08:00
Android (Google) Code Review
1b4d478c99 Merge change I580de484 into eclair
* changes:
  Fix issue #2256270: Package manager sends bad broadcasts when components change
2009-11-11 20:18:44 -08:00
Grace Kloba
c9067b47db am dc30d28b: Merge change I3656f7a3 into eclair
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-plus-aosp

* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
  Honor the mInitialScale set on WebView. This was
2009-11-11 20:14:01 -08:00
Jim Miller
e6da3d7d6a am f2897fe4: Merge change Idc34a3f7 into eclair
Merge commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81' into eclair-plus-aosp

* commit 'f2897fe42e22966127dbee8025d6bdc1d1697d81':
  Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states.
2009-11-11 20:13:49 -08:00
Android (Google) Code Review
597aeef0d0 Merge change I3656f7a3 into eclair
* changes:
  Honor the mInitialScale set on WebView. This was lost when we fixed restoring the scale for a new page.
2009-11-11 20:11:25 -08:00
Android (Google) Code Review
e6195f9c38 Merge change Idc34a3f7 into eclair
* changes:
  Fix 2209086: add drawables for SlidingTab states in PhoneApp. Update string file for new SlidingTab sound states. Tweak "animation" to be 250ms based on conversation with ui guys. Some minor performance tweaks to SlidingTab.
2009-11-11 20:11:13 -08:00
Dianne Hackborn
9422170dc2 am 532d5603: Merge change I80022375 into eclair
Merge commit '532d56034532809da7691059742371c1b4d0656c' into eclair-plus-aosp

* commit '532d56034532809da7691059742371c1b4d0656c':
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
2009-11-11 19:13:15 -08:00
Android (Google) Code Review
8e53dbb18a Merge change I80022375 into eclair
* changes:
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
2009-11-11 19:09:56 -08:00
Romain Guy
b03feb4bc5 am 001e5242: Merge change Icccbd889 into eclair
Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-plus-aosp

* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
2009-11-11 18:55:45 -08:00
Dmitri Plotnikov
f269d7410f am ca203475: Merge change Ifcf20541 into eclair
Merge commit 'ca20347543797a67b48a369f9b901cecabd231e3' into eclair-plus-aosp

* commit 'ca20347543797a67b48a369f9b901cecabd231e3':
  New Javadoc for ContactsContract.
2009-11-11 18:53:41 -08:00
Dianne Hackborn
7422d1462c am 2ade6421: Merge change I775e1ec0 into eclair
Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-plus-aosp

* commit '2ade6421f2d6dd615b559c951deace7143958b90':
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't
2009-11-11 18:53:29 -08:00
Android (Google) Code Review
f96f515323 Merge change Icccbd889 into eclair
* changes:
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
2009-11-11 18:52:07 -08:00
Android (Google) Code Review
822e8bb689 Merge change Ifcf20541 into eclair
* changes:
  New Javadoc for ContactsContract.
2009-11-11 18:49:55 -08:00
Android (Google) Code Review
738a65ac62 Merge change I775e1ec0 into eclair
* changes:
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't
2009-11-11 18:16:05 -08:00
Eric Fischer
b3aaf08da6 am f2335642: Merge change I7fb3bc59 into eclair
Merge commit 'f233564284d492815b1f45f6f2bd66d96b77d9ea' into eclair-plus-aosp

* commit 'f233564284d492815b1f45f6f2bd66d96b77d9ea':
  Add new date formats for the lock screen.
2009-11-11 18:11:12 -08:00
Android (Google) Code Review
b365e7fd7d Merge change I7fb3bc59 into eclair
* changes:
  Add new date formats for the lock screen.
2009-11-11 18:05:12 -08:00
Romain Guy
9f3c26ec9f am 3e584fc9: Merge change I5975651f into eclair
Merge commit '3e584fc944e3d694b4233450f386bd2a930420bf' into eclair-plus-aosp

* commit '3e584fc944e3d694b4233450f386bd2a930420bf':
  Don't feed the timezone to RenderScript time functions, let the library figure it out.
2009-11-11 15:40:07 -08:00
Mike Lockwood
c9aaf5a9bf am f1f26bbb: Merge change I7b8b6cfb into eclair
Merge commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11' into eclair-plus-aosp

* commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11':
  Do not force screen on when undocking from the desk dock.
2009-11-11 15:39:57 -08:00
Android (Google) Code Review
295fb83735 Merge change I5975651f into eclair
* changes:
  Don't feed the timezone to RenderScript time functions, let the library figure it out.
2009-11-11 15:37:37 -08:00
Android (Google) Code Review
6c510e0d90 Merge change I7b8b6cfb into eclair
* changes:
  Do not force screen on when undocking from the desk dock.
2009-11-11 15:36:18 -08:00
Fred Quintana
cd8968797e am 4cb6fc7e: Merge change Icc48b1e7 into eclair
Merge commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20' into eclair-plus-aosp

* commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20':
  don't request a sync when temp providers are created
2009-11-11 15:18:17 -08:00
Android (Google) Code Review
13937c3bc5 Merge change Icc48b1e7 into eclair
* changes:
  don't request a sync when temp providers are created
2009-11-11 15:15:55 -08:00
Grace Kloba
bc142898f5 am bf5b632a: Use getViewHeightWithTitle() to honor the scrollbar setting when computing the maxScrollY for fling. This is honored in the regular scroll in computeVerticalScrollExtent().
Merge commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c' into eclair-plus-aosp

* commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c':
  Use getViewHeightWithTitle() to honor the scrollbar
2009-11-11 14:44:41 -08:00
Grace Kloba
725966998e am d7439f4b: Use computeVerticalScrollRange() to find the bottom of the page as mContentHeight is not in the view system.
Merge commit 'd7439f4bdb31d005011b69112e82a9fed9be4470' into eclair-plus-aosp

* commit 'd7439f4bdb31d005011b69112e82a9fed9be4470':
  Use computeVerticalScrollRange() to find the bottom
2009-11-11 14:42:39 -08:00
Grace Kloba
ede0fe3090 am c9966891: Merge change Ibb245ea7 into eclair
Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-plus-aosp

* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
  Return an empty PluginList instead of null for the
2009-11-11 14:37:33 -08:00
Android (Google) Code Review
8391b8f88c Merge change Ibb245ea7 into eclair
* changes:
  Return an empty PluginList instead of null for the deprecated getPluginList() api.
2009-11-11 14:34:05 -08:00
Jim Miller
df81c242ba am 2f92bd3e: Merge change Ia895aa7d into eclair
Merge commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b' into eclair-plus-aosp

* commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b':
  Fix for 2209086:  Initial pass at new SlidingTab widget and integration into LockScreen.
2009-11-11 14:06:11 -08:00
Android (Google) Code Review
2a76abf35c Merge change Ia895aa7d into eclair
* changes:
  Fix for 2209086:  Initial pass at new SlidingTab widget and integration into LockScreen.
2009-11-11 14:02:00 -08:00
Wink Saville
62f5ba27e0 am 38210df3: Merge change I326c1f7e into eclair
Merge commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0' into eclair-plus-aosp

* commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0':
  Throttle nitz updates as the are too numerous on cdma.
2009-11-11 13:16:55 -08:00
Gilles Duboscq
b842bc05ec am 9d9dda53: Merge change Ia629e0f8 into eclair
Merge commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697' into eclair-plus-aosp

* commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697':
  Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
2009-11-11 13:16:35 -08:00
Dianne Hackborn
b22a90dec7 am 250aa068: Merge change Idf7fafd3 into eclair
Merge commit '250aa068eae7424d454fc65ea83c8a65ca717112' into eclair-plus-aosp

* commit '250aa068eae7424d454fc65ea83c8a65ca717112':
  Fix issue #2248951: Need to turn off touch filtering outside of sholes
2009-11-11 13:16:09 -08:00
Android (Google) Code Review
6da322d5af Merge change I326c1f7e into eclair
* changes:
  Throttle nitz updates as the are too numerous on cdma.
2009-11-11 12:46:22 -08:00
Android (Google) Code Review
a2c27de457 Merge change Ia629e0f8 into eclair
* changes:
  Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 : all the parts should have the same encoding.
2009-11-11 11:53:06 -08:00
Android (Google) Code Review
0b79b3cf22 Merge change Idf7fafd3 into eclair
* changes:
  Fix issue #2248951: Need to turn off touch filtering outside of sholes
2009-11-11 10:54:58 -08:00
Jean-Baptiste Queru
debe2b7f79 merge from open-source master 2009-11-11 08:26:31 -08:00
Daisuke Miyakawa
39a4377f6f am b9c40a65: Merge change I5d30aa18 into eclair
Merge commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c' into eclair-plus-aosp

* commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c':
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
2009-11-10 23:08:40 -08:00
Android (Google) Code Review
d7c1513bda Merge change I5d30aa18 into eclair
* changes:
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
2009-11-10 23:03:57 -08:00
Daisuke Miyakawa
1525178393 am e464de6b: Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
Merge commit 'e464de6b764348a102ae64417d22bbd1c80723dc' into eclair-plus-aosp

* commit 'e464de6b764348a102ae64417d22bbd1c80723dc':
  Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
2009-11-10 23:01:02 -08:00
Dave Sparks
66790cb361 am dd861689: Merge change I05fd0df0 into eclair
Merge commit 'dd861689924198ed22115f0e21be1b81e159a7cc' into eclair-plus-aosp

* commit 'dd861689924198ed22115f0e21be1b81e159a7cc':
  Fix potential deadlock in stopPreview/stopRecord.
2009-11-10 22:32:57 -08:00
Android (Google) Code Review
123e7e712a Merge change I05fd0df0 into eclair
* changes:
  Fix potential deadlock in stopPreview/stopRecord.
2009-11-10 22:29:59 -08:00