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

7657 Commits

Author SHA1 Message Date
Ray Chen
505a318eae am 507748e9: am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 2010-04-05 13:30:13 -07:00
Ray Chen
507748e972 am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 
Merge commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3' into kraken

* commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3':
  Make createVideoThumbnail and createImageThumbnail look consistent.
 2010-04-05 13:19:39 -07:00
Ray Chen
6c9356028c am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent. 
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp

* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
  Make createVideoThumbnail and createImageThumbnail look consistent.
 2010-04-05 13:16:19 -07:00
Ray Chen
44dcf65871 Make createVideoThumbnail and createImageThumbnail look consistent. 
Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
 2010-04-05 13:06:39 -07:00
Cary Clark
9187c0ba4a am 1cab1936: am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings 2010-04-05 12:39:30 -07:00
Cary Clark
1cab19369d am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings 
Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken

* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
  check for webviewcore before reading settings
 2010-04-05 12:33:03 -07:00
Cary Clark
6cf2c14f65 am 3eefc126: check for webviewcore before reading settings 
Merge commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c' into froyo-plus-aosp

* commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c':
  check for webviewcore before reading settings
 2010-04-05 12:30:12 -07:00
Cary Clark
3eefc126e5 check for webviewcore before reading settings 
In setActive(), the WebViewCore instance may
have already been destroyed before the settings
object can be read.

Change-Id: I46b2a57b2d92fc7216b1c984f7044fea1fc2409e
http://b/2570700
 2010-04-05 15:25:26 -04:00
Leon Scroggins
783e72ef4b am 86d663fa: am e64e090e: am f9b1a092: Only include WEB_EDIT if there are more textfields. 2010-04-05 11:47:51 -07:00
Leon Scroggins
86d663faa0 am e64e090e: am f9b1a092: Only include WEB_EDIT if there are more textfields. 
Merge commit 'e64e090e0d4f70233fac901ac1b977123f6f0452' into kraken

* commit 'e64e090e0d4f70233fac901ac1b977123f6f0452':
  Only include WEB_EDIT if there are more textfields.
 2010-04-05 11:40:44 -07:00
Leon Scroggins
e64e090e0d am f9b1a092: Only include WEB_EDIT if there are more textfields. 
Merge commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e' into froyo-plus-aosp

* commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e':
  Only include WEB_EDIT if there are more textfields.
 2010-04-05 11:38:05 -07:00
Leon Scroggins
f9b1a092b6 Only include WEB_EDIT if there are more textfields. 
Fixes http://b/issue?id=2559070

Requires a change to external/webkit.

Change-Id: I411a04d260c781a91d16832704bb5c34e9751bc1
 2010-04-05 14:31:37 -04:00
San Mehat
8839544ebb am d32de7f3: am 9d782f62: am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 2010-04-05 10:53:58 -07:00
San Mehat
d32de7f38f am 9d782f62: am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 
Merge commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7' into kraken

* commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7':
  NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
 2010-04-05 10:44:45 -07:00
San Mehat
9d782f62de am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 
Merge commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386' into froyo-plus-aosp

* commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386':
  NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
 2010-04-05 10:41:19 -07:00
San Mehat
73a8f26aef Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 2010-04-05 10:35:56 -07:00
Grace Kloba
1b70418acf am 1ea99657: am 6f8b89bb: am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 2010-04-02 16:59:01 -07:00
Grace Kloba
1ea99657e7 am 6f8b89bb: am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 
Merge commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec' into kraken

* commit '6f8b89bb6641dfc34fa36dec52d25115b35b37ec':
  Make sure when WebView modified mScrollX/Y directly,
 2010-04-02 16:52:23 -07:00
Grace Kloba
6f8b89bb66 am b2ade4a7: Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 
Merge commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp

* commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
  Make sure when WebView modified mScrollX/Y directly,
 2010-04-02 16:46:39 -07:00
Grace Kloba
b2ade4a7e6 Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 2010-04-02 16:41:13 -07:00
Grace Kloba
327dce9e36 Make sure when WebView modified mScrollX/Y directly, 
onScrollChanged() is called so that the View system
can do what it needs to adjust.

As WebView's onScrollChanged will call sendOurVisibleRect(),
we don't need to call it explicitly any more.

Fix http://b/issue?id=2438457
 2010-04-02 15:38:55 -07:00
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
San Mehat
be23fba286 NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed 
Change-Id: I1d6816c9754801504a988802118a2167e0eb8690
Signed-off-by: San Mehat <san@google.com>
 2010-04-02 11:50:27 -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