4040 Commits

Author SHA1 Message Date
Fred Quintana
c4516a7b62 add a transaction monitor 2009-09-08 17:25:09 -07:00
Eric Fischer
817f3cb41b am 046263ce: Merge change 24220 into eclair
Merge commit '046263ce352912990e492eb5cfd833c21109cf9f' into eclair-plus-aosp

* commit '046263ce352912990e492eb5cfd833c21109cf9f':
  Import revised translations.  DO NOT MERGE
2009-09-08 17:01:11 -07:00
Android (Google) Code Review
046263ce35 Merge change 24220 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-09-08 16:58:33 -07:00
Eric Fischer
5cacfb9df2 Import revised translations. DO NOT MERGE 2009-09-08 16:54:05 -07:00
Amith Yamasani
359c140620 am e8ffb1da: am e989496e: Merge change 24194 into eclair
Merge commit 'e8ffb1da28b397422ec67c93577abe37f0561228'

* commit 'e8ffb1da28b397422ec67c93577abe37f0561228':
  Make the hardkeyboard long press dialog look the same as that of soft keyboard.
2009-09-08 16:03:46 -07:00
Costin Manolache
5e97766a42 am 93c2b332: am b752098e: Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
Merge commit '93c2b332ce0f36d7774e33db1954f8a780b20ba6'

* commit '93c2b332ce0f36d7774e33db1954f8a780b20ba6':
  Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
2009-09-08 16:03:18 -07:00
Nick Pelly
187320fa70 am 328b53b5: am 33b69050: Merge change 24155 into eclair
Merge commit '328b53b58b06b07369b6238dd6ba234194e3b456'

* commit '328b53b58b06b07369b6238dd6ba234194e3b456':
  Add javadoc to explain which permissions are required for Public BT API's.
2009-09-08 16:02:02 -07:00
Dmitri Plotnikov
feaa563a63 am 8544a349: am 7452d292: Merge change 24086 into eclair
Merge commit '8544a349837596ff8889abf3f564c35bb5a1c51a'

* commit '8544a349837596ff8889abf3f564c35bb5a1c51a':
  Fixing asymmetry between phone filter and email filter APIs.
2009-09-08 16:01:55 -07:00
Derek Sollenberger
ac6d106643 am af4ce5bd: am c3a30a00: Merge change 24153 into eclair
Merge commit 'af4ce5bd00be6fd3319c7cdcc3ddf27ac81ac24e'

* commit 'af4ce5bd00be6fd3319c7cdcc3ddf27ac81ac24e':
  adding support for webkit plugins to use the java view system
2009-09-08 16:01:47 -07:00
Cary Clark
af7996479b am e9aab295: am c18e9ed3: Merge change 24161 into eclair
Merge commit 'e9aab295739992c763f070d9fdffcce95d15d2af'

* commit 'e9aab295739992c763f070d9fdffcce95d15d2af':
  don't fling if there's nowhere to go
2009-09-08 16:01:40 -07:00
Cary Clark
4b60422353 am 7ac6cf9d: am f8d4964e: default overview mode to false in webkit
Merge commit '7ac6cf9d9e6928b85ae4c4c35a515ce7111de066'

* commit '7ac6cf9d9e6928b85ae4c4c35a515ce7111de066':
  default overview mode to false in webkit
2009-09-08 16:01:37 -07:00
Derek Sollenberger
8a46f64803 am bfe76e4f: am 377c5c15: Revert "Adding classes to enable plugins to use the java view system."
Merge commit 'bfe76e4f7b08882cf419f93e3511e90f59774ca7'

* commit 'bfe76e4f7b08882cf419f93e3511e90f59774ca7':
  Revert "Adding classes to enable plugins to use the java view system."
2009-09-08 16:01:33 -07:00
Derek Sollenberger
7e670ea545 am 96d97921: am 67dffd93: Merge change 23485 into eclair
Merge commit '96d979212f3e2548f1fcfad8208f81b895d80087'

* commit '96d979212f3e2548f1fcfad8208f81b895d80087':
  Adding classes to enable plugins to use the java view system.
2009-09-08 16:01:30 -07:00
Daisuke Miyakawa
5851d3bf92 am 71881682: am 7390c5af: Merge change 24097 into eclair
Merge commit '718816821564b61301b0ea93423f7d9d47c2d555'

* commit '718816821564b61301b0ea93423f7d9d47c2d555':
  Fix small bugs in VCardComposer.java.
2009-09-08 16:01:26 -07:00
Dianne Hackborn
50e1069cf0 am c66e6851: am 0d23b82b: Fix 0%^&%!! SDK build.
Merge commit 'c66e685115b45667ad67372fbf769c6f2dd52b1f'

* commit 'c66e685115b45667ad67372fbf769c6f2dd52b1f':
  Fix $#%^&%!! SDK build.
2009-09-08 16:01:23 -07:00
Dianne Hackborn
3331da069c am da2e19c6: am eb034652: Implement all of the infrastructure for configuring wallpapers.
Merge commit 'da2e19c6ad5c153d87c8da1a695e5e823d17e29b'

* commit 'da2e19c6ad5c153d87c8da1a695e5e823d17e29b':
  Implement all of the infrastructure for configuring wallpapers.
2009-09-08 16:01:18 -07:00
Dianne Hackborn
e8151fcbdc am 2a5006c1: am c916c044: Merge change 24099 into eclair
Merge commit '2a5006c195c9635a66158bf6b3212351ea5232dc'

* commit '2a5006c195c9635a66158bf6b3212351ea5232dc':
  Fix issue #2095422: Some fades from opaque to transparent don't work
2009-09-08 16:01:08 -07:00
Bjorn Bringert
41c9e2016c am 63aaa98a: am 96f8613d: Add Gservices constants for GlobalSearch settings
Merge commit '63aaa98a76064703950c5a4c24325b5ff0fa6b25'

* commit '63aaa98a76064703950c5a4c24325b5ff0fa6b25':
  Add Gservices constants for GlobalSearch settings
2009-09-08 16:01:01 -07:00
Owen Lin
16ea2b7a69 am 00453ad2: am d4344ba9: Merge change 23415 into eclair
Merge commit '00453ad22a445f1cdef768ed1f062f0fac7c1dc9'

* commit '00453ad22a445f1cdef768ed1f062f0fac7c1dc9':
  Open some methods on PrefereneManager to allow others use the inflater.
2009-09-08 16:00:57 -07:00
Bob Lee
55991c08b8 am 0dbc9317: am 88e62579: Merge change 24060 into eclair
Merge commit '0dbc9317540ce3200cf0587ee0f8f5fb241574b9'

* commit '0dbc9317540ce3200cf0587ee0f8f5fb241574b9':
  Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
2009-09-08 16:00:54 -07:00
Amith Yamasani
e8ffb1da28 am e989496e: Merge change 24194 into eclair
Merge commit 'e989496e2bb7a64abe7336db1e728095ebc83a0c' into eclair-plus-aosp

* commit 'e989496e2bb7a64abe7336db1e728095ebc83a0c':
  Make the hardkeyboard long press dialog look the same as that of soft keyboard.
2009-09-08 15:36:28 -07:00
Android (Google) Code Review
e989496e2b Merge change 24194 into eclair
* changes:
  Make the hardkeyboard long press dialog look the same as that of soft keyboard.
2009-09-08 15:33:50 -07:00
Amith Yamasani
38d838d3ae Make the hardkeyboard long press dialog look the same as that of soft keyboard.
New assets for transparent buttons and background.
2009-09-08 14:25:25 -07:00
Costin Manolache
93c2b332ce am b752098e: Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
Merge commit 'b752098e8d12d6e7925d97458078dbb896ca8a05' into eclair-plus-aosp

* commit 'b752098e8d12d6e7925d97458078dbb896ca8a05':
  Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
2009-09-08 14:10:35 -07:00
Costin Manolache
b752098e8d Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it. 2009-09-08 14:05:43 -07:00
Nick Pelly
328b53b58b am 33b69050: Merge change 24155 into eclair
Merge commit '33b69050b2074c1768c45895418f0454e52e279a' into eclair-plus-aosp

* commit '33b69050b2074c1768c45895418f0454e52e279a':
  Add javadoc to explain which permissions are required for Public BT API's.
2009-09-08 13:43:05 -07:00
Dmitri Plotnikov
8544a34983 am 7452d292: Merge change 24086 into eclair
Merge commit '7452d292599b6ce3b13a52d13e514beac937838a' into eclair-plus-aosp

* commit '7452d292599b6ce3b13a52d13e514beac937838a':
  Fixing asymmetry between phone filter and email filter APIs.
2009-09-08 13:42:11 -07:00
Derek Sollenberger
af4ce5bd00 am c3a30a00: Merge change 24153 into eclair
Merge commit 'c3a30a00333910268e2b93c58f14214b074aa929' into eclair-plus-aosp

* commit 'c3a30a00333910268e2b93c58f14214b074aa929':
  adding support for webkit plugins to use the java view system
2009-09-08 13:42:03 -07:00
Cary Clark
e9aab29573 am c18e9ed3: Merge change 24161 into eclair
Merge commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86' into eclair-plus-aosp

* commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86':
  don't fling if there's nowhere to go
2009-09-08 13:41:54 -07:00
Cary Clark
7ac6cf9d9e am f8d4964e: default overview mode to false in webkit
Merge commit 'f8d4964e45f7e671f4b333386b4269b23ced4750' into eclair-plus-aosp

* commit 'f8d4964e45f7e671f4b333386b4269b23ced4750':
  default overview mode to false in webkit
2009-09-08 13:41:50 -07:00
Derek Sollenberger
bfe76e4f7b am 377c5c15: Revert "Adding classes to enable plugins to use the java view system."
Merge commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a' into eclair-plus-aosp

* commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a':
  Revert "Adding classes to enable plugins to use the java view system."
2009-09-08 13:41:47 -07:00
Derek Sollenberger
96d979212f am 67dffd93: Merge change 23485 into eclair
Merge commit '67dffd93e045e08e446df11e370597a9463f010c' into eclair-plus-aosp

* commit '67dffd93e045e08e446df11e370597a9463f010c':
  Adding classes to enable plugins to use the java view system.
2009-09-08 13:41:43 -07:00
Daisuke Miyakawa
7188168215 am 7390c5af: Merge change 24097 into eclair
Merge commit '7390c5af7a0c2379fa72218ea63a714f843edf0f' into eclair-plus-aosp

* commit '7390c5af7a0c2379fa72218ea63a714f843edf0f':
  Fix small bugs in VCardComposer.java.
2009-09-08 13:41:39 -07:00
Dianne Hackborn
c66e685115 am 0d23b82b: Fix 0%^&%!! SDK build.
Merge commit '0d23b82be2176e4beaa462bd50ff577819651b87' into eclair-plus-aosp

* commit '0d23b82be2176e4beaa462bd50ff577819651b87':
  Fix $#%^&%!! SDK build.
2009-09-08 13:41:35 -07:00
Dianne Hackborn
da2e19c6ad am eb034652: Implement all of the infrastructure for configuring wallpapers.
Merge commit 'eb034652c2037a47ebfd99779e8383bb8bb528af' into eclair-plus-aosp

* commit 'eb034652c2037a47ebfd99779e8383bb8bb528af':
  Implement all of the infrastructure for configuring wallpapers.
2009-09-08 13:41:26 -07:00
Dianne Hackborn
2a5006c195 am c916c044: Merge change 24099 into eclair
Merge commit 'c916c04495292c86051a2c31e90cca26a9bd99c1' into eclair-plus-aosp

* commit 'c916c04495292c86051a2c31e90cca26a9bd99c1':
  Fix issue #2095422: Some fades from opaque to transparent don't work
2009-09-08 13:41:07 -07:00
Bjorn Bringert
63aaa98a76 am 96f8613d: Add Gservices constants for GlobalSearch settings
Merge commit '96f8613d95122a491a44f755f06845cc2c13e81e' into eclair-plus-aosp

* commit '96f8613d95122a491a44f755f06845cc2c13e81e':
  Add Gservices constants for GlobalSearch settings
2009-09-08 13:41:00 -07:00
Owen Lin
00453ad22a am d4344ba9: Merge change 23415 into eclair
Merge commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b' into eclair-plus-aosp

* commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b':
  Open some methods on PrefereneManager to allow others use the inflater.
2009-09-08 13:40:56 -07:00
Bob Lee
0dbc931754 am 88e62579: Merge change 24060 into eclair
Merge commit '88e625795943dea84b2e7c32f37e71303143b728' into eclair-plus-aosp

* commit '88e625795943dea84b2e7c32f37e71303143b728':
  Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
2009-09-08 13:40:51 -07:00
Android (Google) Code Review
33b69050b2 Merge change 24155 into eclair
* changes:
  Add javadoc to explain which permissions are required for Public BT API's.
2009-09-08 13:37:10 -07:00
Android (Google) Code Review
7452d29259 Merge change 24086 into eclair
* changes:
  Fixing asymmetry between phone filter and email filter APIs.
2009-09-08 13:21:39 -07:00
Android (Google) Code Review
c3a30a0033 Merge change 24153 into eclair
* changes:
  adding support for webkit plugins to use the java view system
2009-09-08 12:53:17 -07:00
Derek Sollenberger
2c3eb14d43 adding support for webkit plugins to use the java view system
Change-Id: I4fb328e5f30476fe4aa70565bacb969dc97b495d
2009-09-08 15:42:23 -04:00
Android (Google) Code Review
c18e9ed39c Merge change 24161 into eclair
* changes:
  don't fling if there's nowhere to go
2009-09-08 11:29:28 -07:00
Cary Clark
aa7caa6032 don't fling if there's nowhere to go
Add a test to doFling() to return quickly if the fling has
no effect. For simplicity, only test for horizontal or vertical
flings.

The man purpose is to avoid suspending webkit until the fling
animation is complete when the purpose of the touch drag is
to activate a touch event, like a swipe in superpudu.

fixes http://b/issue?id=2052852
2009-09-08 14:15:07 -04:00
Cary Clark
f8d4964e45 default overview mode to false in webkit
Browser defaults overview mode to true in BrowserSettings.java,
but a WebView should default overview mode to false. This permits
applications without zoom interfaces, such as HTMLViewer, to
have the same interface as before.
2009-09-08 13:23:24 -04:00
Nick Pelly
cf44059813 Add javadoc to explain which permissions are required for Public BT API's. 2009-09-08 10:12:06 -07:00
Derek Sollenberger
377c5c15f8 Revert "Adding classes to enable plugins to use the java view system."
This reverts commit b127dc29bbe41dde9cb30e178bd252f48e84e533.
2009-09-08 09:30:47 -04:00
Android (Google) Code Review
67dffd93e0 Merge change 23485 into eclair
* changes:
  Adding classes to enable plugins to use the java view system.
2009-09-08 05:48:06 -07:00
Tammo Spalink
0bb9960598 Do not die when printing empty prefs.
Addresses issue:
http://buganizer/issue?id=1974140

Change-Id: I0001d69e8d278d4ca900f5ce56ad50c0b4b6b694
2009-09-08 18:30:33 +08:00