drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,436 Commits 1 Branch 0 Tags
Commit Graph

3885 Commits

Author SHA1 Message Date
Dianne Hackborn
c94126bc99 am 25ff4e8c: am 23976407: Maybe fix issue #2145012: Array bounds exception in touch event processing 
Merge commit '25ff4e8c8111fabf79a922073ccf2873520d03cd'

* commit '25ff4e8c8111fabf79a922073ccf2873520d03cd':
  Maybe fix issue #2145012: Array bounds exception in touch event processing
 2009-09-28 01:09:41 -07:00
Dianne Hackborn
b8949398b2 am bc21ba24: am 093f5810: Merge change 27238 into eclair 
Merge commit 'bc21ba2410233b40b21a190b26285a791ac5cc58'

* commit 'bc21ba2410233b40b21a190b26285a791ac5cc58':
  The touch screen is probably a feature.
 2009-09-28 01:09:32 -07:00
Tadashi G. Takaoka
07783cda29 am 0198a9ce: am f06e9984: Merge change 26993 into eclair 
Merge commit '0198a9ce3a66ba8b64f797044b718e7b48e46bcb'

* commit '0198a9ce3a66ba8b64f797044b718e7b48e46bcb':
  Pass provider authority to SyncActivityTooManyDeletes
 2009-09-28 01:08:54 -07:00
Jeff Sharkey
b18e90cd46 am 67e40117: am 05701839: Remove query parameters for delaying group updates. 
Merge commit '67e40117f7f79163469a7702de50c0123bf677d2'

* commit '67e40117f7f79163469a7702de50c0123bf677d2':
  Remove query parameters for delaying group updates.
 2009-09-28 01:07:33 -07:00
Robert Greenwalt
be5e37d579 am fc6cd596: am a16ca5ec: Merge change 27141 into eclair 
Merge commit 'fc6cd59650d9f3f649dcdf5f5e23b3e089d7d5b9'

* commit 'fc6cd59650d9f3f649dcdf5f5e23b3e089d7d5b9':
  Fix ConnectivityManager's handling of apn switch.
 2009-09-27 15:43:08 -07:00
Dianne Hackborn
7fd48b2001 am e42ed5fb: am 05eeeace: Merge change 27178 into eclair 
Merge commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21'

* commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21':
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
 2009-09-27 15:42:58 -07:00
Dianne Hackborn
2ecde7d9ca am 7bae17c6: am 48c84052: Merge change 27162 into eclair 
Merge commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b'

* commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b':
  Fix Activity.overridePendingTransition().
 2009-09-27 15:41:39 -07:00
Fred Quintana
1a85cf6d77 am abd4d965: am 6ecaff15: add a optional String to the key of notifications to allow users to scope them 
Merge commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58'

* commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58':
  add a optional String to the key of notifications to allow users
 2009-09-27 15:41:20 -07:00
Daisuke Miyakawa
a94e377c1e am d4e21df9: am 3ed05574: Merge change 27077 into eclair 
Merge commit 'd4e21df96109c26a00116103567af22ff1e8f8a6'

* commit 'd4e21df96109c26a00116103567af22ff1e8f8a6':
  Two changes toward vCard composer.
 2009-09-27 15:38:12 -07:00
Grace Kloba
2aa3313b6c am be3abd73: am 0f5fd893: Merge change 27052 into eclair 
Merge commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8'

* commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8':
  If WebCore doesn't response touch down in time, don't
 2009-09-27 15:37:39 -07: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
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
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
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
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
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
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
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
Brad Fitzpatrick
e63eb08352 am 0623e674: am 3219ab4d: Fix typo in Bluetooth docs. 
Merge commit '0623e674d9bb2c739653435c01c2c9b830be8ebd'

* commit '0623e674d9bb2c739653435c01c2c9b830be8ebd':
  Fix typo in Bluetooth docs.
 2009-09-25 11:26:55 -07:00
Cary Clark
4a045a3762 am 6fb27c5a: am 96cfad5d: check for null before calling native webkit from java webview 
Merge commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217'

* commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217':
  check for null before calling native webkit from java webview
 2009-09-25 11:24:51 -07:00
Bryan Mawhinney
5675f5b6f8 am 7e74262a: am 82e62668: Merge change 27038 into eclair 
Merge commit '7e74262ab6b650bd5cca218067de36e42d95952e'

* commit '7e74262ab6b650bd5cca218067de36e42d95952e':
  Redraw search autocomplete dropdown after config change.
 2009-09-25 11:24:20 -07:00
Bjorn Bringert
243d240467 am 079b824c: am 81d84c0c: am 6266e40a: Better JavaDoc for Activity.onSearchRequested(). 
Merge commit '079b824cf05bee18447ace93958e8f7edcb2cf61'

* commit '079b824cf05bee18447ace93958e8f7edcb2cf61':
  Better JavaDoc for Activity.onSearchRequested().
 2009-09-25 11:24:11 -07:00
Bryan Mawhinney
c784380d10 am 067e0164: am 42b7af57: Dismiss QSB dialog when doing an in-app global search. 
Merge commit '067e0164cae268098a5305bbfca401d4e917b78b'

* commit '067e0164cae268098a5305bbfca401d4e917b78b':
  Dismiss QSB dialog when doing an in-app global search.
 2009-09-25 11:23:53 -07:00
Dianne Hackborn
cd02a278e4 am c6cfd0b0: am 3e2ac884: Fix/improve issue #2142662: too easy to click a link/item instead of fling 
Merge commit 'c6cfd0b0cc99d0f78230c7ba95b0e9aeb791c32c'

* commit 'c6cfd0b0cc99d0f78230c7ba95b0e9aeb791c32c':
  Fix/improve issue #2142662: too easy to click a link/item instead of fling
 2009-09-25 11:23:26 -07:00
Dianne Hackborn
212770b632 am 7510aba7: am 896b15ab: Merge change 27016 into eclair 
Merge commit '7510aba7a5a1024394be938c7e8b35de785f7355'

* commit '7510aba7a5a1024394be938c7e8b35de785f7355':
  A variety of work on animations.
 2009-09-25 11:23:16 -07:00
Mike Cleron
4b0ee97d67 am f45076dd: am fdf53a46: Merge change 26935 into eclair 
Merge commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d'

* commit 'f45076dd37a649c9bdf10aaf5bc42793c72b497d':
  Fix bug 2129190
 2009-09-25 11:22:49 -07:00
Nick Pelly
a0c1abcef6 am a7e508eb: am 18b1e79a: Bluetooth API: Do not allow apps to programmatically make BT discoverable. 
Merge commit 'a7e508eb55c8f63ff43aea2374a2773893e69321'

* commit 'a7e508eb55c8f63ff43aea2374a2773893e69321':
  Bluetooth API: Do not allow apps to programmatically make BT discoverable.
 2009-09-25 11:16:17 -07:00
Fred Quintana
120d132475 am 63344cae: am 91a00d3a: fix typo 
Merge commit '63344cae94520d789dbe4002dcc3d6ef45d9a040'

* commit '63344cae94520d789dbe4002dcc3d6ef45d9a040':
  fix typo
 2009-09-25 11:14:38 -07:00
Fred Quintana
e2f2df4041 am 5dfe9f15: am f5808415: rename misc to birthday 
Merge commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff'

* commit '5dfe9f157c174162b3f2a6010a2955c508dab9ff':
  rename misc to birthday
 2009-09-25 11:14:31 -07:00
Daisuke Miyakawa
de6bbe7fc1 am 2f24ab9f: am 4579ed28: Merge change 26944 into eclair 
Merge commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d'

* commit '2f24ab9fdc2c9d998a94e10a7ae0ce3087cffa7d':
  Add "TYPE=" to type attribute when appropriate.
 2009-09-25 11:13:53 -07:00
Daisuke Miyakawa
0b43103b46 am 5b774984: am b7e89e4c: Merge change 26912 into eclair 
Merge commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c'

* commit '5b7749845ed752e3c2c5d30cec5d726b7c64c42c':
  Add appendType() utility method.
 2009-09-25 11:12:11 -07:00
Bryan Mawhinney
753bc00f15 am cbafa094: am dfb7bc8c: Merge change 26821 into eclair 
Merge commit 'cbafa094449f9e6646409b6bd26ba11956b32047'

* commit 'cbafa094449f9e6646409b6bd26ba11956b32047':
  Make removeOnAccountsUpdateListener cope with null handlers.
 2009-09-25 11:11:31 -07:00
Fred Quintana
d0bde7ba9b am 93bc8cab: am 531e580a: remove the incorrectly located nickname 
Merge commit '93bc8cab98784851b1bb080b57d059ac35fa619a'

* commit '93bc8cab98784851b1bb080b57d059ac35fa619a':
  remove the incorrectly located nickname
 2009-09-25 11:11:22 -07:00