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

7602 Commits

Author SHA1 Message Date
Mike LeBeau
d06bf31acf am 40330aae: am 2e1cd1cd: am e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173" into froyo 2010-04-01 23:48:13 -07:00
Jeff Hamilton
81da42c52e Merge "Add an option to not register the ContentObserver when creating a CursorAdapter." 2010-04-01 18:22:40 -07:00
Mike LeBeau
40330aaece am 2e1cd1cd: am e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173" into froyo 
Merge commit '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1' into kraken

* commit '2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1':
  Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
 2010-04-01 17:50:48 -07:00
Mike LeBeau
2e1cd1cd00 am e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173" into froyo 
Merge commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d' into froyo-plus-aosp

* commit 'e134279ffa3d5a3871fd39e9e9328b3ab1fec88d':
  Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
 2010-04-01 17:42:38 -07:00
Mike LeBeau
e134279ffa Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173" into froyo 2010-04-01 15:30:51 -07:00
Mike LeBeau
6af5ad5e61 Also send EXTRA_CALLING_PACKAGE for voice search intents that do web 
search (not just for in-app search). Needed as part of http://b/2546173

Change-Id: I661ff52bace754459651eacd369a19e97364c3c6
 2010-04-01 15:29:46 -07:00
Fred Quintana
3c19eaaa3e am cb3f6e9f: am 2aa2f78e: am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo 2010-04-01 14:44:11 -07:00
Fred Quintana
cb3f6e9f9f am 2aa2f78e: am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo 
Merge commit '2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc' into kraken

* commit '2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc':
  allow null authtokens to invalidateAuthToken
 2010-04-01 14:37:34 -07:00
Fred Quintana
2aa2f78ec5 am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo 
Merge commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a' into froyo-plus-aosp

* commit 'e8b1971c7b09f14f2d9a2e12399294798cf2066a':
  allow null authtokens to invalidateAuthToken
 2010-04-01 14:32:51 -07:00
Fred Quintana
e8b1971c7b Merge "allow null authtokens to invalidateAuthToken" into froyo 2010-04-01 14:27:00 -07:00
Fred Quintana
f35b68f2b9 allow null authtokens to invalidateAuthToken 
Change-Id: I78e91ef2f43503e13386894851f0d781583a4943
http://b/issue?id=2561519
 2010-04-01 14:26:32 -07:00
Jeff Hamilton
451513baa7 Add an option to not register the ContentObserver when creating a CursorAdapter. 
Change-Id: Ic18f0307f5ba0d54f7270d8d1e032feff537360b
 2010-04-01 15:30:00 -05:00
Derek Sollenberger
bb9d7bd4cf am d3bafad8: am 4c932079: am 11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive. 2010-04-01 12:19:00 -07:00
Derek Sollenberger
d3bafad896 am 4c932079: am 11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive. 
Merge commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba' into kraken

* commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba':
  Match RFC requirement that the domain portion of a cookie should be case-insensitive.
 2010-04-01 12:10:03 -07:00
Derek Sollenberger
4c93207940 am 11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive. 
Merge commit '11fb6144604fbd1148695421e9ab6896701a431b' into froyo-plus-aosp

* commit '11fb6144604fbd1148695421e9ab6896701a431b':
  Match RFC requirement that the domain portion of a cookie should be case-insensitive.
 2010-04-01 12:06:25 -07:00
Derek Sollenberger
11fb614460 Match RFC requirement that the domain portion of a cookie should be case-insensitive. 
fixes bug #2549818.

Change-Id: I1372171568828545e78690f1ddc0ddcf25ddd428
 2010-04-01 14:53:06 -04:00
Dirk Dougherty
7fb51bf546 am 865bd884: am 2d8234b7: Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo 
Merge commit '865bd884e878bbc6d9f5832fda6971c21754b588' into kraken

* commit '865bd884e878bbc6d9f5832fda6971c21754b588':
  doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
 2010-04-01 10:47:00 -07:00
Dirk Dougherty
865bd884e8 am 2d8234b7: Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo 
Merge commit '2d8234b73d11fdc2178232cabad3ffaa23723405' into froyo-plus-aosp

* commit '2d8234b73d11fdc2178232cabad3ffaa23723405':
  doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
 2010-04-01 10:40:15 -07:00
Robert Greenwalt
a6dfa15e64 am 4e925f8a: am cab133a7: am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 2010-04-01 10:36:05 -07:00
Dirk Dougherty
2d8234b73d Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo 2010-04-01 10:35:21 -07:00
Robert Greenwalt
4e925f8afb am cab133a7: am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 
Merge commit 'cab133a7fa39969f136e3f401f97f6ce843514bb' into kraken

* commit 'cab133a7fa39969f136e3f401f97f6ce843514bb':
  NetworkManagementService: Add interface counters & throttle API
 2010-04-01 10:27:04 -07:00
Robert Greenwalt
cab133a7fa am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 
Merge commit '33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp

* commit '33eb7767fb49482643df80c8b5567da83aa0e49f':
  NetworkManagementService: Add interface counters & throttle API
 2010-04-01 10:22:51 -07:00
Robert Greenwalt
33eb7767fb Merge "NetworkManagementService: Add interface counters & throttle API" into froyo 2010-04-01 10:19:57 -07:00
Kristian Monsen
1170cbfc2d am 86a09e4d: am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 2010-04-01 10:07:34 -07:00
Kristian Monsen
86a09e4d76 am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 
Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken

* commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578':
  Fix for bug 2558156: Encodig is null
 2010-04-01 10:00:08 -07:00
Kristian Monsen
4ba57a4e0a am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo 
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp

* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
  Fix for bug 2558156: Encodig is null
 2010-04-01 09:57:12 -07:00
Kristian Monsen
70c22a48e6 Merge "Fix for bug 2558156: Encodig is null" into froyo 2010-04-01 09:54:47 -07:00
Kristian Monsen
d08127fff1 Fix for bug 2558156: Encodig is null 
This does not actually pass the test since the test has wrong expectations, but it is at least doing the right thing.

Change-Id: I7da29a3f101647bb628805514cf2bdef24864e50
 2010-04-01 17:38:07 +01:00
Dirk Dougherty
3d5f648f8f doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.) 
Change-Id: I1d2b80b8dc3f8b2e3c1befcbb7c4c522d78a2db8
 2010-04-01 09:16:08 -07:00
Dirk Dougherty
75c66da209 sdk doc change: clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc. 
Change-Id: I07f6858f78e3b48ccaa99e87d81d18bf0499bdc0
 2010-04-01 09:08:35 -07:00
Kenny Root
ab023301b0 Merge "Don't measure for a secondary caret unless we have one." 2010-04-01 09:01:45 -07:00
Ben Murdoch
6036fb37d4 am 2e646429: am bf691348: am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 2010-04-01 08:53:41 -07:00
Ben Murdoch
2e646429f4 am bf691348: am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 
Merge commit 'bf6913481eff68a69d1e6ba312227e2fcea29793' into kraken

* commit 'bf6913481eff68a69d1e6ba312227e2fcea29793':
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:47:58 -07:00
Ben Murdoch
bf6913481e am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo 
Merge commit '352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp

* commit '352cf1a45e26803a466d096ca2d679ea5a3ac249':
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:44:58 -07:00
Ben Murdoch
352cf1a45e Merge changes Ic9531e3c,I3f04433b into froyo 
* changes:
  Cherry pick from master.
  Cherry pick from master.
 2010-04-01 08:42:14 -07:00
San Mehat
91cac64cd0 NetworkManagementService: Add interface counters & throttle API 
Change-Id: I4976549cdbb027ba7859335e69bf866e738961c9
Signed-off-by: San Mehat <san@google.com>
 2010-04-01 08:34:20 -07:00
Grace Kloba
433dc6a764 am 0aca8f9c: am fe72c533: am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 2010-04-01 08:26:07 -07:00
Grace Kloba
0aca8f9c6b am fe72c533: am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 
Merge commit 'fe72c533fe210e147111e0a862360032365dd987' into kraken

* commit 'fe72c533fe210e147111e0a862360032365dd987':
  As we don't support over scroll any more, we need
 2010-04-01 08:20:48 -07:00
Steve Block
0348440e4a Cherry pick from master. 
This change forwards to the WebView HTTP authentication credentials that
are supplied to an XHR from JavaScript. This allows the WebView to store these
credentials for use with later requests.

This is a re-working of https://android-git.corp.google.com/g/46430

Bug: 2544330
Change-Id: I3f04433b00233d7b7bf4f7e3471d8d15d8817f93
 2010-04-01 16:19:39 +01:00
Grace Kloba
fe72c533fe am 461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 
Merge commit '461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp

* commit '461cef5d209fd072c82f6a70eb106e4690b7ef97':
  As we don't support over scroll any more, we need
 2010-04-01 08:17:35 -07:00
Grace Kloba
461cef5d20 Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo 2010-04-01 08:15:09 -07:00
Bjorn Bringert
48d9980d0c Expose Context.STORAGE_SERVICE in master 
This was recently hidden in Froyo, and the the change automerged
to Master, where it broke the SDK build since StorageManager is
exposed in Master.

Change-Id: I44f9f666c7644e1c16e3274adc6ae6cd5ac0fdd4
 2010-04-01 14:33:22 +01:00
Romain Guy
f4d67ca61d Merge "Don't ignore the parameters passed to the load methods." 2010-04-01 01:02:01 -07:00
Romain Guy
43d390085d Don't ignore the parameters passed to the load methods. 
Change-Id: Id2090a2a0a39dc19b821ee6a01dd206de366397e
 2010-04-01 01:01:17 -07:00
Dianne Hackborn
a72073e945 am 3bd18537: am 6ff57ee3: am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 2010-03-31 23:34:24 -07:00
Dianne Hackborn
c1c1d63e05 am d0b5b3cb: am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 2010-03-31 23:34:16 -07:00
Adam Powell
ffd8e0fe94 am fff52b6a: am 5af7ef60: am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 2010-03-31 23:34:04 -07:00
Dianne Hackborn
3bd1853798 am 6ff57ee3: am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo 
Merge commit '6ff57ee310290715c000fd771cd7e18b1537ccbc' into kraken

* commit '6ff57ee310290715c000fd771cd7e18b1537ccbc':
  Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
 2010-03-31 23:23:20 -07:00
Dianne Hackborn
d0b5b3cb61 am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791: Expose API to go in to car mode." into froyo 
Merge commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23' into kraken

* commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23':
  Fix issue #2560791: Expose API to go in to car mode.
 2010-03-31 23:23:16 -07:00
Adam Powell
fff52b6a3d am 5af7ef60: am 40cd1cf6: Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo 
Merge commit '5af7ef60277060b94604a0b9679bb08a4dc1e731' into kraken

* commit '5af7ef60277060b94604a0b9679bb08a4dc1e731':
  Fix bug 2562240 and clean up scrollbar behavior
 2010-03-31 23:23:02 -07:00