Mike Cleron
5cf07feb3d
am db9c3f2e: Merge change 27188 into eclair
...
Merge commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735' into eclair-plus-aosp
* commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735':
Fix 2146581: Make tabs work for donut apps
2009-09-27 00:36:15 -07:00
Android (Google) Code Review
db9c3f2e9a
Merge change 27188 into eclair
...
* changes:
Fix 2146581: Make tabs work for donut apps Use different tab assets with the original coloring scheme for apps that are not Eclair-aware.
2009-09-27 03:31:59 -04:00
Dianne Hackborn
25ff4e8c81
am 23976407: Maybe fix issue #2145012 : Array bounds exception in touch event processing
...
Merge commit '2397640740e053af7ef4aa742467f723186d5ad7' into eclair-plus-aosp
* commit '2397640740e053af7ef4aa742467f723186d5ad7':
Maybe fix issue #2145012 : Array bounds exception in touch event processing
2009-09-26 17:52:29 -07:00
Dianne Hackborn
2397640740
Maybe fix issue #2145012 : Array bounds exception in touch event processing
...
Change-Id: I223d9ae29f22f08cb8426ccd8bbadeedd5db3fc3
2009-09-26 17:34:50 -07:00
Dianne Hackborn
bc21ba2410
am 093f5810: Merge change 27238 into eclair
...
Merge commit '093f581090d8cf98f5877746d924107f7695dd8b' into eclair-plus-aosp
* commit '093f581090d8cf98f5877746d924107f7695dd8b':
The touch screen is probably a feature.
2009-09-26 17:06:41 -07:00
Android (Google) Code Review
093f581090
Merge change 27238 into eclair
...
* changes:
The touch screen is probably a feature.
2009-09-26 20:00:07 -04:00
Dianne Hackborn
039c68e756
The touch screen is probably a feature.
...
Also extend the feature APIs a bit.
Change-Id: I99e932d7f4e61edb0e20f75c55e9831e4b59a14d
2009-09-26 16:39:23 -07:00
Evan Millar
c321ab992d
am 3579c4c6: Merge change 27234 into eclair
...
Merge commit '3579c4c6729dd8aa077550531a8337bf0664b23d' into eclair-plus-aosp
* commit '3579c4c6729dd8aa077550531a8337bf0664b23d':
Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
2009-09-26 14:54:47 -07:00
Android (Google) Code Review
3579c4c672
Merge change 27234 into eclair
...
* changes:
Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
2009-09-26 17:49:12 -04:00
Evan Millar
695800047c
Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
...
Change-Id: I1636914ef47fc5319f2593d3e7aea33e523be3c7
2009-09-26 14:47:38 -07:00
Tadashi G. Takaoka
0198a9ce3a
am f06e9984: Merge change 26993 into eclair
...
Merge commit 'f06e9984e833907057065946cf68ff95d6af1ead' into eclair-plus-aosp
* commit 'f06e9984e833907057065946cf68ff95d6af1ead':
Pass provider authority to SyncActivityTooManyDeletes
2009-09-26 14:13:08 -07:00
Android (Google) Code Review
f06e9984e8
Merge change 26993 into eclair
...
* changes:
Pass provider authority to SyncActivityTooManyDeletes
2009-09-26 17:06:47 -04:00
Evan Millar
8290ab7533
am b27a1166: Merge change 27233 into eclair
...
Merge commit 'b27a1166d538afaf2be480cc0101645ea7b3964f' into eclair-plus-aosp
* commit 'b27a1166d538afaf2be480cc0101645ea7b3964f':
Change longClick -> click in ContactHeaderWidget.
2009-09-26 13:40:11 -07:00
Evan Millar
bf07e03291
Change longClick -> click in ContactHeaderWidget.
...
Also don't enable it by default, but add an api to explicitly request
it.
Change-Id: I75fa4bfddba7a1800dec24e6a068eca614370a26
2009-09-26 13:30:01 -07:00
Jeff Sharkey
67e40117f7
am 05701839: Remove query parameters for delaying group updates.
...
Merge commit '057018399c7ce6d3893ee5fc622f1592f51773b9' into eclair-plus-aosp
* commit '057018399c7ce6d3893ee5fc622f1592f51773b9':
Remove query parameters for delaying group updates.
2009-09-26 05:35:15 -07:00
Jeff Sharkey
057018399c
Remove query parameters for delaying group updates.
...
Callers should instead use applyBatch(), which now delays
any visible updates until the transation finishes. This
partially fixes http://b/2075275
2009-09-26 02:14:43 -07:00
Robert Greenwalt
fc6cd59650
am a16ca5ec: Merge change 27141 into eclair
...
Merge commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404' into eclair-plus-aosp
* commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404':
Fix ConnectivityManager's handling of apn switch.
2009-09-25 17:57:27 -07:00
Mike Cleron
7609764295
Fix 2146581: Make tabs work for donut apps
...
Use different tab assets with the original coloring scheme
for apps that are not Eclair-aware.
2009-09-25 17:53:56 -07:00
Android (Google) Code Review
a16ca5ec4b
Merge change 27141 into eclair
...
* changes:
Fix ConnectivityManager's handling of apn switch.
2009-09-25 20:51:00 -04:00
Dianne Hackborn
e42ed5fb1b
am 05eeeace: Merge change 27178 into eclair
...
Merge commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45' into eclair-plus-aosp
* commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45':
Fix issue #2136448 : googleapps crashes while adding 2nd gmail account
2009-09-25 17:28:04 -07:00
Android (Google) Code Review
05eeeacee6
Merge change 27178 into eclair
...
* changes:
Fix issue #2136448 : googleapps crashes while adding 2nd gmail account
2009-09-25 20:19:59 -04:00
Dianne Hackborn
c1e605eff4
Fix issue #2136448 : googleapps crashes while adding 2nd gmail account
...
Change-Id: I1dc27959650643bf0c7fd0564719856d7b3efeb1
2009-09-25 17:18:15 -07:00
Robert Greenwalt
d1aca6aa73
Fix ConnectivityManager's handling of apn switch.
...
It was clearing the interfacename when it was needed later in the process - the prevented us
from clearing the route to private dns servers and clearing the flag that this was set.
Consequently future uses would not set the private dns servers (since it thought they were already
set) and our lookups would fail.
bug: 2146929
2009-09-25 16:43:20 -07:00
Neel Parekh
1f395a210a
am 6ecacd40: Center name when no status. Also shows the status if exists (not actually hooked up yet though).
...
Merge commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899' into eclair-plus-aosp
* commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899':
Center name when no status.
2009-09-25 16:33:11 -07:00
Neel Parekh
6ecacd40dd
Center name when no status.
...
Also shows the status if exists (not actually hooked up yet though).
Bug: 2138736
2009-09-25 16:22:26 -07:00
Dianne Hackborn
7bae17c6de
am 48c84052: Merge change 27162 into eclair
...
Merge commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af' into eclair-plus-aosp
* commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af':
Fix Activity.overridePendingTransition().
2009-09-25 16:21:02 -07:00
Neel Parekh
9a9b97d3a9
am 35468254: Merge change 26720 into eclair
...
Merge commit '3546825421cab5330583633ed854134c35d1c08d' into eclair-plus-aosp
* commit '3546825421cab5330583633ed854134c35d1c08d':
Allow us to set the contact uri without setting the fast track's uri
2009-09-25 16:11:46 -07:00
Android (Google) Code Review
48c84052e2
Merge change 27162 into eclair
...
* changes:
Fix Activity.overridePendingTransition().
2009-09-25 19:11:43 -04:00
Fred Quintana
abd4d965db
am 6ecaff15: add a optional String to the key of notifications to allow users to scope them
...
Merge commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544' into eclair-plus-aosp
* commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544':
add a optional String to the key of notifications to allow users
2009-09-25 16:11:40 -07:00
Dianne Hackborn
8b571a817c
Fix Activity.overridePendingTransition().
...
Change-Id: I4ce995bd58efbbedbe4d0d1e9e0d0f4a8e261843
2009-09-25 16:09:43 -07:00
Android (Google) Code Review
3546825421
Merge change 26720 into eclair
...
* changes:
Allow us to set the contact uri without setting the fast track's uri
2009-09-25 19:05:10 -04:00
Fred Quintana
6ecaff1583
add a optional String to the key of notifications to allow users
...
to scope them
2009-09-25 16:01:22 -07:00
Karl Rosaen
08fc1b507c
am 0cb901c4: Merge change 27076 into eclair
...
Merge commit '0cb901c4be24dc1a7bba729afca0bd12ed04ef6c' into eclair-plus-aosp
* commit '0cb901c4be24dc1a7bba729afca0bd12ed04ef6c':
Optimize rotary selector widget by using bitmaps instead of drawables.
2009-09-25 14:39:44 -07:00
Android (Google) Code Review
0cb901c4be
Merge change 27076 into eclair
...
* changes:
Optimize rotary selector widget by using bitmaps instead of drawables.
2009-09-25 17:34:35 -04:00
Daisuke Miyakawa
d4e21df961
am 3ed05574: Merge change 27077 into eclair
...
Merge commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb' into eclair-plus-aosp
* commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb':
Two changes toward vCard composer.
2009-09-25 14:08:45 -07:00
Android (Google) Code Review
3ed05574e3
Merge change 27077 into eclair
...
* changes:
Two changes toward vCard composer.
2009-09-25 17:02:05 -04:00
Grace Kloba
be3abd7334
am 0f5fd893: Merge change 27052 into eclair
...
Merge commit '0f5fd893bed202e90617a36bd4ca4211d667c320' into eclair-plus-aosp
* commit '0f5fd893bed202e90617a36bd4ca4211d667c320':
If WebCore doesn't response touch down in time, don't
2009-09-25 13:44:48 -07:00
Daisuke Miyakawa
21ac410319
Two changes toward vCard composer.
...
- Separate the two cases: mCursor == null and mCursor.getCount() == 0.
- Make error messages viewable from user applications, which enables them to
translate those messages.
Internal issue number: 2138187, 27103
2009-09-25 13:30:23 -07:00
Grace Kloba
f58af62211
If WebCore doesn't response touch down in time, don't
...
block the UI tap, pan and double tap. Added a time out
(which is same as shortpress time out, 200ms) for how
long we wait for WebCore's response for touch down.
This should fix the problem where pan/touch is not working
all the time when Flash plugin is installed.
Fix http://b/issue?id=2144761
2009-09-25 12:06:08 -07:00
Karl Rosaen
c8ad6dcb8a
Optimize rotary selector widget by using bitmaps instead of drawables.
...
In profiling setBounds was expensive. Time per onDraw from 13.3ms to 6.59ms :)
2009-09-25 11:35:41 -07:00
Brad Fitzpatrick
0623e674d9
am 3219ab4d: Fix typo in Bluetooth docs.
...
Merge commit '3219ab4de27cd40b2149b0dd13edd412efe40244' into eclair-plus-aosp
* commit '3219ab4de27cd40b2149b0dd13edd412efe40244':
Fix typo in Bluetooth docs.
2009-09-25 10:49:09 -07:00
Brad Fitzpatrick
3219ab4de2
Fix typo in Bluetooth docs.
2009-09-25 20:28:02 +04:00
Cary Clark
6fb27c5a68
am 96cfad5d: check for null before calling native webkit from java webview
...
Merge commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5' into eclair-plus-aosp
* commit '96cfad5d673b49d8b3a724d7b1066493aacd74d5':
check for null before calling native webkit from java webview
2009-09-25 09:14:27 -07:00
Tadashi G. Takaoka
86135d3240
Pass provider authority to SyncActivityTooManyDeletes
...
Internal Bug: 2138733
2009-09-25 09:12:25 -07:00
Cary Clark
96cfad5d67
check for null before calling native webkit from java webview
...
fixes http://b/issue?id=2121684
2009-09-25 12:06:20 -04:00
Bryan Mawhinney
7e74262ab6
am 82e62668: Merge change 27038 into eclair
...
Merge commit '82e62668d0d3e09f27629c7aff6425faacdfa7f8' into eclair-plus-aosp
* commit '82e62668d0d3e09f27629c7aff6425faacdfa7f8':
Redraw search autocomplete dropdown after config change.
2009-09-25 07:50:12 -07:00
Android (Google) Code Review
82e62668d0
Merge change 27038 into eclair
...
* changes:
Redraw search autocomplete dropdown after config change.
2009-09-25 10:43:10 -04:00
Bryan Mawhinney
29d52e120f
Redraw search autocomplete dropdown after config change.
...
This ensures the dropdown is redrawn after changing
from landscape to portrait mode, for example.
Change-Id: I71f4425d1df789faf34d20dd30b3a5c64b5caec3
2009-09-25 15:35:21 +01:00
Bjorn Bringert
079b824cf0
am 81d84c0c: am 6266e40a: Better JavaDoc for Activity.onSearchRequested().
...
Merge commit '81d84c0cb244290a58bf8e78a3d638750cf7dd3f' into eclair-plus-aosp
* commit '81d84c0cb244290a58bf8e78a3d638750cf7dd3f':
Better JavaDoc for Activity.onSearchRequested().
2009-09-25 06:51:01 -07:00
Bjorn Bringert
81d84c0cb2
am 6266e40a: Better JavaDoc for Activity.onSearchRequested().
...
Merge commit '6266e40a754d82afa717ef068898c8418a0bb5c3' into eclair
* commit '6266e40a754d82afa717ef068898c8418a0bb5c3':
Better JavaDoc for Activity.onSearchRequested().
2009-09-25 06:45:02 -07:00