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

21145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
d1cff1b4a4 Fix issue #2564479: Favorite Recipes App Installation Fail 
Change-Id: Ide1045e3f6bef9ed2a2fee08bfeda8c58feb685f
 2010-04-02 16:51:26 -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
Adam Powell
fcced83081 am ffc67455: am 128f1a87: am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 2010-04-02 16:32:21 -07:00
Adam Powell
ffc67455f8 am 128f1a87: am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Merge commit '128f1a87c55a291109ce521a92308c186e5d2db5' into kraken

* commit '128f1a87c55a291109ce521a92308c186e5d2db5':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
 2010-04-02 16:25:33 -07:00
Adam Powell
128f1a87c5 am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp

* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
 2010-04-02 16:20:54 -07:00
Adam Powell
6024ca5c90 Fix bug 2185026 - back button in context menu now calls onContextMenuClosed() 
Change-Id: I6c16879a8ad8e4651d21f639a620a936bf991f8d
 2010-04-02 16:05:20 -07:00
Romain Guy
954ad481a4 Merge "Add Overlay mode to the PorterDuff list of supported modes." 2010-04-02 16:03:47 -07:00
Romain Guy
bb2890d40b Add Overlay mode to the PorterDuff list of supported modes. 
Change-Id: I2ec03b9a1039db3e3c16786222e4fde4782ed67e
 2010-04-02 15:48:46 -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
Andreas Huber
04506177a3 am e47009aa: am 0f7c543c: am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 2010-04-02 14:20:17 -07:00
Andreas Huber
e47009aabd am 0f7c543c: am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 
Merge commit '0f7c543cc48d287591b5638a15bf8ca977e162a2' into kraken

* commit '0f7c543cc48d287591b5638a15bf8ca977e162a2':
  Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
 2010-04-02 14:14:24 -07:00
Amith Yamasani
2098eadfba Potential fix for bug: 2564824 : Device runtime restart in BatteryService 
Look for corrupted bytes and replace with ?

If the problem is in the parsing code, then this will not help.

Change-Id: If33643f126a4099d4113e37760c6ef74683fe97e
 2010-04-02 14:11:29 -07:00
Andreas Huber
0f7c543cc4 am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 
Merge commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866' into froyo-plus-aosp

* commit 'eb6e3edc0f21c5c8a574f8086f9622c44c0ff866':
  Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.
 2010-04-02 14:09:11 -07:00
Andreas Huber
eb6e3edc0f Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 2010-04-02 14:03:46 -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
Dianne Hackborn
e13beb09da Merge "Add a new intent category used for activities running in carmode." into froyo 2010-04-02 13:35:59 -07:00
Irfan Sheriff
4de5b61bb0 am db83a6f5: am 90bd9433: am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo 2010-04-02 13:05:04 -07:00
Suchi Amalapurapu
9a7310e68d am 5130073d: am 21f15f68: am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo 2010-04-02 13:05:01 -07:00
Andreas Huber
a4357addf6 Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly. 
Change-Id: I90c7db6656a53339c5d454336548c4f00d0d9064
related-to-bug: 2548426
 2010-04-02 12:55:31 -07:00
Irfan Sheriff
db83a6f56c am 90bd9433: am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo 
Merge commit '90bd943364af8af8e3409f3fffe409f724a4210b' into kraken

* commit '90bd943364af8af8e3409f3fffe409f724a4210b':
  Dont start wifi if in airplane mode
 2010-04-02 12:53:49 -07:00
Suchi Amalapurapu
5130073d17 am 21f15f68: am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo 
Merge commit '21f15f68c2940a87954d9889e208ffbbed2c1995' into kraken

* commit '21f15f68c2940a87954d9889e208ffbbed2c1995':
  Handle exceptions when doing dexopt.
 2010-04-02 12:53:45 -07:00
Irfan Sheriff
90bd943364 am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo 
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp

* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
  Dont start wifi if in airplane mode
 2010-04-02 12:51:05 -07:00
Suchi Amalapurapu
21f15f68c2 am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo 
Merge commit 'a77acab9c623a8b63b46d14686cf1a86dd863289' into froyo-plus-aosp

* commit 'a77acab9c623a8b63b46d14686cf1a86dd863289':
  Handle exceptions when doing dexopt.
 2010-04-02 12:51:01 -07:00
Irfan Sheriff
9c50996b17 Merge "Dont start wifi if in airplane mode" into froyo 2010-04-02 12:47:45 -07:00
Suchi Amalapurapu
a77acab9c6 Merge "Handle exceptions when doing dexopt." into froyo 2010-04-02 12:46:38 -07:00
Irfan Sheriff
60e3ba071d Dont start wifi if in airplane mode 
Now that wifi start is asynchronous
at the time of bring up, make sure
Wifi is not started if in airplane
mode.

Bug: 2567652
Change-Id: I947b7c8480029973bcbf028f6143aabbc88c9793
 2010-04-02 12:43:04 -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
Andreas Huber
9702a03b75 am 1f857164: am f0e62b7a: am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:32:48 -07:00
Andreas Huber
1f857164a5 am f0e62b7a: am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 
Merge commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad' into kraken

* commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad':
  Support another kind of iso mpeg4 file.
 2010-04-02 11:26:55 -07:00
Andreas Huber
f0e62b7a50 am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 
Merge commit '29039deea99a5529d92f7add3f9077ab247d3acd' into froyo-plus-aosp

* commit '29039deea99a5529d92f7add3f9077ab247d3acd':
  Support another kind of iso mpeg4 file.
 2010-04-02 11:21:34 -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
Andreas Huber
29039deea9 Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:18:32 -07:00
Daniel Sandler
891f4ba9ec am e21dd4ed: am 750edffb: am 25642f0b: Merge "Make desk mode work again." into froyo 2010-04-02 11:12:16 -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
Daniel Sandler
e21dd4edbb am 750edffb: am 25642f0b: Merge "Make desk mode work again." into froyo 
Merge commit '750edffbc0fe528b93097f9ce909f446540cfff5' into kraken

* commit '750edffbc0fe528b93097f9ce909f446540cfff5':
  Make desk mode work again.
 2010-04-02 11:03:13 -07: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
Daniel Sandler
750edffbc0 am 25642f0b: Merge "Make desk mode work again." into froyo 
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp

* commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
  Make desk mode work again.
 2010-04-02 10:59:41 -07:00