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

29539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
5f36c96f6d Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work... 
...when it is called before the parent Activity becomes ready.

Change-Id: Id021564ebb3419353234e459b7358b9a72660715
 2010-08-26 15:56:59 -07:00
Jim Miller
c70bd1921b Merge "Fix 2797185: Integrate 3D RecentApps View into system." 2010-08-26 14:24:44 -07:00
Chet Haase
d7c2f623fe Merge "Fix problems with early ending of Sequencer" 2010-08-26 14:20:01 -07:00
Chet Haase
f1b9b46421 Fix problems with early ending of Sequencer 
Change-Id: Ib7548059ee3d3d713b78f86a2d290be4397c167d
 2010-08-26 13:59:20 -07:00
Guang Zhu
ba4da86add am fe8eaf3b: am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 
Merge commit 'fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c'

* commit 'fe8eaf3b5dc52cecaf15ccabe9a8717cce701f6c':
  add mouse up/down/click support in DumpRenderTree
 2010-08-26 13:15:29 -07:00
Dianne Hackborn
5fcfa52d60 am efd05ea6: am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b'

* commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 13:15:21 -07:00
Eric Laurent
832aa58a30 am 2db73305: am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread 
Merge commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305'

* commit '2db7330578c1ac4466f4cbbf0f7723df6c2da305':
  Added automated tests for reverb audio effect.
 2010-08-26 13:15:09 -07:00
James Dong
8c26c127b7 am 9509a0ce: am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 
Merge commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1'

* commit '9509a0ce7ec1b10305bb6bd5fbf0edcf5b4f7fe1':
  Make sure that timestamp does not go backward in MP4 file writer
 2010-08-26 13:15:00 -07:00
Banavathu, Srinivas Naik
1e8dd5b4a7 am eb182d78: am f3ee6f87: Telephony: Remove references to mExitECMRunnable object. 
Merge commit 'eb182d789df75be7a778a6264e658972af73800c'

* commit 'eb182d789df75be7a778a6264e658972af73800c':
  Telephony: Remove references to mExitECMRunnable object.
 2010-08-26 13:14:49 -07:00
Robert Greenwalt
cf7706a83b am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 
Merge commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b'

* commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b':
  Add an API to request route to an IPv6 host.
 2010-08-26 13:14:17 -07:00
Shimeng (Simon) Wang
b79c271857 Merge "Restore zoom level when browser is restored." 2010-08-26 11:05:48 -07:00
Shimeng (Simon) Wang
4ae1f6f2ae Restore zoom level when browser is restored. 
issue: 2950667
Change-Id: If335813eed6311d3d01354147bd62f90ffbdacfb
 2010-08-26 10:58:38 -07:00
Guang Zhu
fe8eaf3b5d am 1c045003: Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 
Merge commit '1c045003788725b40af5489149ac0fc8bfebb1ea' into gingerbread-plus-aosp

* commit '1c045003788725b40af5489149ac0fc8bfebb1ea':
  add mouse up/down/click support in DumpRenderTree
 2010-08-26 10:52:27 -07:00
Dianne Hackborn
efd05ea69a am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp

* commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b':
  Fix issue #2951784: Launcher crashes on startup
 2010-08-26 10:50:11 -07:00
Guang Zhu
1c04500378 Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread 2010-08-26 10:49:19 -07:00
Dianne Hackborn
0a7f5fc474 Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 2010-08-26 10:47:48 -07:00
Dianne Hackborn
9dae48e399 Fix issue #2951784: Launcher crashes on startup 
Change-Id: I98aedacce9a7d6b8bc168f39ea5489b40dc0ec8d
 2010-08-26 10:20:01 -07:00
Eric Laurent
2db7330578 am dfded35b: Merge "Added automated tests for reverb audio effect." into gingerbread 
Merge commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a' into gingerbread-plus-aosp

* commit 'dfded35b3a5cb8eb57d47b750f3a4b0085fd3c0a':
  Added automated tests for reverb audio effect.
 2010-08-26 10:19:23 -07:00
Eric Laurent
dfded35b3a Merge "Added automated tests for reverb audio effect." into gingerbread 2010-08-26 10:16:26 -07:00
James Dong
9509a0ce7e am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp

* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
  Make sure that timestamp does not go backward in MP4 file writer
 2010-08-26 09:53:30 -07:00
James Dong
318a759e3c Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread 2010-08-26 09:47:12 -07:00
Eric Laurent
391e2d0d88 Added automated tests for reverb audio effect. 
- Added tests for preset and environmental reverb to functional media frame work tests.
- created a new class for energy probing used by all audio effect tests and corrected energy calculation.

Change-Id: Ib8109e70020176a87538309eb028109b81b93dde
 2010-08-26 09:42:49 -07:00
Maksymilian Osowski
6db53149ca Merge "Tweaked the logging + some minor style fixes." 2010-08-26 09:12:09 -07:00
Banavathu, Srinivas Naik
eb182d789d am f3ee6f87: Telephony: Remove references to mExitECMRunnable object. 
Merge commit 'f3ee6f87a344b185d8bde12c77440c9020378510' into gingerbread-plus-aosp

* commit 'f3ee6f87a344b185d8bde12c77440c9020378510':
  Telephony: Remove references to mExitECMRunnable object.
 2010-08-26 09:02:33 -07:00
Steve Block
9d660cb5f3 Update run_apach2.py to serve HTTP tests at server root 
The complete set of layout tests is still available at /LayoutTests
and scripts at /WebKitTools/DumpRenderTree/android.

Note that this requires a corresponding change to
external/webkit/WebKitTools/DumpRenderTree/android/get_layout_tests_dir_contents.php

Bug: 2951727
Change-Id: Idf366942ffd5786759c989e992359b7e7dbb182c
 2010-08-26 16:57:17 +01:00
Steve Block
ee273fac7f Use locals to make run_apache2.py more readable 
Also fixes style

Change-Id: I8045b7deb5badfed7758be459d05c58d0ff2e390
 2010-08-26 16:56:44 +01:00
Maksymilian Osowski
2e5982a55a Tweaked the logging + some minor style fixes. 
Change-Id: If89fe8ab1845780ecf23c5fd339a4932ebec9c0c
 2010-08-26 16:48:41 +01:00
Robert Greenwalt
4ea54f442e Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
Maksymilian Osowski
da9f91a107 Merge "Updated the script to include access log." 2010-08-26 08:01:58 -07:00
Maksymilian Osowski
fe33f987cb Updated the script to include access log. 
Change-Id: I3c97d60580040fa8e4bf63660091edb9c7a871fb
 2010-08-26 15:25:02 +01:00
satok
3eeb774c9f am 15edaceb: (-s ours) am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread 
Merge commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6'

* commit '15edaceb2d46f18c32fb20a3d3dae556c1078bb6':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
 2010-08-26 07:08:55 -07:00
satok
15edaceb2d am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread 
Merge commit '913a8925c07e854a80bf5df87561f290d3a56d61' into gingerbread-plus-aosp

* commit '913a8925c07e854a80bf5df87561f290d3a56d61':
  DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
 2010-08-26 07:01:28 -07:00
satok
913a8925c0 DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread 
Change-Id: Ied15b4f2f447ee3e3b858d4ca65c21c30dfa4eba
 2010-08-26 22:53:07 +09:00
Maksymilian Osowski
7f335371dd Merge "Added forwarding service." 2010-08-26 06:21:58 -07:00
Daniel Sandler
e9ddcba348 screenshot command: sound effect, filename incrementing 
Change-Id: I0302cda9791f14c23936dbdcce8a70711f65e07d
 2010-08-26 09:16:43 -04:00
Maksymilian Osowski
56d7e400ec Added forwarding service. 
It creates the sockets on the device that allow DumpRenderTree2 to get tests from the server running on the remote machine. Communication happens through the adb.

Change-Id: I7f26ffc78195b6c5f4d423a57d5ee5f0f4a9c615
 2010-08-26 13:38:54 +01:00
Chung-yih Wang
b6d4723aab Revert "Add Wifi High Perf. mode during a call." 
This reverts commit 0858806ffcb9ff34725abb79106aa1de27d1bf60.

Change-Id: I0432ac7af6e0becf196728190b71dfe82ce63cd0
 2010-08-26 16:37:10 +08:00
Chung-yih Wang
c54f65e61d am cfc3e71e: am 0858806f: Add Wifi High Perf. mode during a call. 
Merge commit 'cfc3e71eae0c7f4f1b824b00d64cf268e646f702'

* commit 'cfc3e71eae0c7f4f1b824b00d64cf268e646f702':
  Add Wifi High Perf. mode during a call.
 2010-08-26 00:26:47 -07:00
Chung-yih Wang
cfc3e71eae am 0858806f: Add Wifi High Perf. mode during a call. 
Merge commit '0858806ffcb9ff34725abb79106aa1de27d1bf60' into gingerbread-plus-aosp

* commit '0858806ffcb9ff34725abb79106aa1de27d1bf60':
  Add Wifi High Perf. mode during a call.
 2010-08-26 00:24:17 -07:00
Chung-yih Wang
0858806ffc Add Wifi High Perf. mode during a call. 
To prevent the wifi from entering low-power mode due to the screen off
triggered by the proximity sensor.

Change-Id: I490bc594d800bc30c256e52ef3bce08bf86bc7b1
 2010-08-26 15:05:48 +08:00
Dianne Hackborn
c8f8497b9c resolved conflicts for merge of 66d633d2 to master 
Change-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586
 2010-08-25 23:14:44 -07:00
Dianne Hackborn
66d633d208 am 3003a017: Merge "Don\'t retain global ref to last inflated context." into gingerbread 
Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp

* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
  Don't retain global ref to last inflated context.
 2010-08-25 22:02:18 -07:00
Dianne Hackborn
3003a017d3 Merge "Don't retain global ref to last inflated context." into gingerbread 2010-08-25 22:00:28 -07:00
Dianne Hackborn
7e269644fc Don't retain global ref to last inflated context. 
Also rework URI permission granting to support upcoming
clipboard use.

Change-Id: I9842920350955531c5a511c2ecc5215e8c783343
 2010-08-25 21:50:54 -07:00
Jim Miller
e6ad1a8ba2 Fix 2797185: Integrate 3D RecentApps View into system. 
This adds 3D recents to the platform.  Enabling it is a
matter of setting 'config_enableRecentApps3D' on devices
capable of supporting it (those with OGLES2.0 at the moment).

Change-Id: Ife7bfe8ca02e7657821b68f915e31b0dab50cd2c
 2010-08-25 20:43:00 -07:00
Chia-chi Yeh
89bf83a87d am 91fe7464: am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread 
Merge commit '91fe746437e1709b83b4eb4d113e5f435d7c6412'

* commit '91fe746437e1709b83b4eb4d113e5f435d7c6412':
  Revert "RTP: integrate the echo canceller from speex."
 2010-08-25 20:02:04 -07:00
Hung-ying Tyan
4d1b114b5f am d06e641d: am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread 
Merge commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1'

* commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1':
  CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
 2010-08-25 20:02:00 -07:00
Chia-chi Yeh
91fe746437 am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread 
Merge commit '14e00621c81da6a0391da47afce77945b27c7231' into gingerbread-plus-aosp

* commit '14e00621c81da6a0391da47afce77945b27c7231':
  Revert "RTP: integrate the echo canceller from speex."
 2010-08-25 19:46:04 -07:00
Chia-chi Yeh
14e00621c8 Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread 2010-08-25 19:43:58 -07:00
Chia-chi Yeh
7fa7ee11f6 Revert "RTP: integrate the echo canceller from speex." 
This reverts commit 4ae6ec428f3570b9020b35ada6a62f94af66d888.
 2010-08-26 10:33:09 +08:00