Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,026 Commits 3 Branches 0 Tags
feaccd777fcb538ace644e707ec1ff350df1cea0
Commit Graph

7635 Commits

Author SHA1 Message Date
Charles Chen
feaccd777f am 265bffa9: am 36b205dc: am 6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #2548048 2010-04-02 13:54:20 -07:00
Dianne Hackborn
488fd5d9c3 am 4d075b02: am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo 2010-04-02 13:51:25 -07:00
Charles Chen
265bffa901 am 36b205dc: am 6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #2548048 
Merge commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b' into kraken

* commit '36b205dc6fbe010b393e2f885bd7d6d05b74919b':
  Unhiding TTS API constants and methods needed for TTS plugin support.
 2010-04-02 13:48:25 -07:00
Charles Chen
36b205dc6f am 6df44727: Unhiding TTS API constants and methods needed for TTS plugin support. This is a fix for bug #2548048 
Merge commit '6df44727d06548015e741dd8f63716602ed1e5d1' into froyo-plus-aosp

* commit '6df44727d06548015e741dd8f63716602ed1e5d1':
  Unhiding TTS API constants and methods needed for TTS plugin support.
 2010-04-02 13:45:30 -07:00
Dianne Hackborn
4d075b029f am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo 
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken

* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
  Add a new intent category used for activities running in carmode.
 2010-04-02 13:42:09 -07:00
Charles Chen
6df44727d0 Unhiding TTS API constants and methods needed for TTS plugin support. 
This is a fix for bug #2548048

Change-Id: Ieb60979098c1d2e82618204882bd523d271a8784
 2010-04-02 13:39:53 -07:00
Dianne Hackborn
9bdc45084f am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo 
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp

* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
  Add a new intent category used for activities running in carmode.
 2010-04-02 13:39:11 -07:00
Adam Powell
702d985b5d am 942d070c: am 1f29b4cd: am 21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo 2010-04-02 11:19:10 -07:00
Fred Quintana
e1b4cb6051 am a269a54e: am 3667b9b4: am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo 2010-04-02 11:12:13 -07:00
Adam Powell
942d070cc6 am 1f29b4cd: am 21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo 
Merge commit '1f29b4cd1280cc223b7bafd5d4d7a232a5b3c40f' into kraken

* commit '1f29b4cd1280cc223b7bafd5d4d7a232a5b3c40f':
  Fix AbsListView scrolling behavior at edges.
 2010-04-02 11:10:03 -07:00
Adam Powell
1f29b4cd12 am 21990922: Merge "Fix AbsListView scrolling behavior at edges." into froyo 
Merge commit '219909224d9f5fdb4fe1c97fad048894c4619fe7' into froyo-plus-aosp

* commit '219909224d9f5fdb4fe1c97fad048894c4619fe7':
  Fix AbsListView scrolling behavior at edges.
 2010-04-02 11:06:34 -07:00
Bernd Holzhey
aea4b678b5 Add a new intent category used for activities running in carmode. 
Change-Id: I4702538c9f53cc0b64eae72298e27232cdfb3548
 2010-04-02 20:04:10 +02:00
Adam Powell
219909224d Merge "Fix AbsListView scrolling behavior at edges." into froyo 2010-04-02 11:02:21 -07:00
Fred Quintana
a269a54e07 am 3667b9b4: am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo 
Merge commit '3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken

* commit '3667b9b471a6585d22106cbfe4a04111ca86643c':
  revert the stripping of System Group:
 2010-04-02 11:00:30 -07:00
Fred Quintana
3667b9b471 am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo 
Merge commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp

* commit '30ed25c252e9eb9923d71676e8f703bb775b7cdf':
  revert the stripping of System Group:
 2010-04-02 10:53:22 -07:00
Fred Quintana
30ed25c252 Merge "revert the stripping of System Group: from the names of google system groups" into froyo 2010-04-02 10:47:11 -07:00
Adam Powell
b7795432a5 Fix AbsListView scrolling behavior at edges. 
Allow the user to start scrolling back into content immediately
after dragging past the end of content.

Remove some dead code.

Change-Id: Ife8f60499ac58179ba1e2500ca8745916392a4bc
 2010-04-02 10:21:55 -07:00
Grace Kloba
fc2583e107 am c23799bc: am f34d9e20: am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo 2010-04-02 09:28:53 -07:00
Grace Kloba
c23799bc27 am f34d9e20: am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo 
Merge commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4' into kraken

* commit 'f34d9e20c7f4c5537beb4287c79b24ab351bcda4':
  Instead of holding an ApplicationContext, JWebCoreJavaBridge
 2010-04-02 09:22:07 -07:00
Grace Kloba
f34d9e20c7 am 61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo 
Merge commit '61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp

* commit '61c3a13e5f9d20c621f49598a0082063404c5f7e':
  Instead of holding an ApplicationContext, JWebCoreJavaBridge
 2010-04-02 09:19:06 -07:00
Grace Kloba
61c3a13e5f Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo 2010-04-02 09:14:39 -07:00
Mike LeBeau
13ac37e3df am e86e0d1e: am 3079afaa: am af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correc 2010-04-01 23:48:42 -07:00
Charles Chen
c8687ef1d3 am 89261412: am 9ea4668c: am ddc2eb8e: Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo 2010-04-01 23:48:34 -07:00
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
e86e0d1ee0 am 3079afaa: am af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by 
Merge commit '3079afaaf549316483a0f30d22eb157656ca7951' into kraken

* commit '3079afaaf549316483a0f30d22eb157656ca7951':
  Use flattenToShortString instead of toShortString on ComponentNames to
 2010-04-01 18:19:54 -07:00
Mike LeBeau
3079afaaf5 am af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentNam 
Merge commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7' into froyo-plus-aosp

* commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7':
  Use flattenToShortString instead of toShortString on ComponentNames to
 2010-04-01 18:14:30 -07:00
Mike LeBeau
af8c900a18 Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentName.unflattenFromString." into froyo 2010-04-01 18:11:43 -07:00
Mike LeBeau
d0635d51bc Use flattenToShortString instead of toShortString on ComponentNames to 
be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have
been using toShortString because that includes curly braces and is not
correctly parsed by ComponentName.unflattenFromString.

This was needed as part of http://b/2546173

Change-Id: If34a9273cbcae13a75347be0b6b7ef307134ed40
 2010-04-01 18:08:34 -07:00
Charles Chen
89261412bc am 9ea4668c: am ddc2eb8e: Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo 
Merge commit '9ea4668c3fabba6d9b8e610030d2ba370b782e86' into kraken

* commit '9ea4668c3fabba6d9b8e610030d2ba370b782e86':
  Fix for bug 2564771 - pitch setting between apps can
 2010-04-01 18:05:21 -07:00
Charles Chen
9ea4668c3f am ddc2eb8e: Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo 
Merge commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76' into froyo-plus-aosp

* commit 'ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76':
  Fix for bug 2564771 - pitch setting between apps can
 2010-04-01 17:59:57 -07:00
Charles Chen
ddc2eb8ee3 Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo 2010-04-01 17:56:47 -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
Grace Kloba
9b95ab17ec Instead of holding an ApplicationContext, JWebCoreJavaBridge 
will have a reference of the current window's main
WebView. It is only non-null if the WebView's window
has the focus.

Extract setActive() from onWindowFocusChanged() so
that onAttachedToWindow() can call it directly. The
old way has a mis-matching call to onWindowFocusChanged.

Fix http://b/issue?id=2559152
 2010-04-01 17:40:07 -07:00
Charles Chen
1a2712ce2a Fix for bug 2564771 - pitch setting between apps can 
interfere with one another.

Root cause was not caching all the params that were needed.
This change fixes that bug as well as related bugs for remembering
the default engine and for making sure that the right engine is
loaded when checking for language availability.

Change-Id: I2a76da8faec8112036e68d27539db444c53a1509
 2010-04-01 17:39:15 -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
Fred Quintana
d316258285 revert the stripping of System Group: 
from the names of google system groups

Change-Id: I677a7abb42a0c3d70d7e7009325f76a4644f1cb1
http://b/issue?id=2558197
 2010-04-01 11:43:57 -07:00
Dirk Dougherty
7fb51bf546 am 865bd884: am 2d8234b7: Merge "doc change: cherry pick 75c66da209. (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 75c66da209. (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