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

29511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
d222c84047 Disable all the hardware decoders except for h.264 video decode, since the software decoders are faster. 
Change-Id: Ia41194752ef72feb4ed1d5199e97b1649075b646
 2010-08-26 14:33:09 -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
Maksymilian Osowski
6db53149ca Merge "Tweaked the logging + some minor style fixes." 2010-08-26 09:12:09 -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
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
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
Hung-ying Tyan
d06e641dbf am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread 
Merge commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf' into gingerbread-plus-aosp

* commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf':
  CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
 2010-08-25 19:30:03 -07:00
Chung-yih Wang
6d92e3c9ad am 5e0d8337: am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread 
Merge commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a'

* commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a':
  Add dynamic uid info for tracking the sip service usage.
 2010-08-25 19:28:45 -07:00
Hung-ying Tyan
108a06c9fc Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread 2010-08-25 19:27:50 -07:00
Chung-yih Wang
5e0d833710 am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread 
Merge commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe' into gingerbread-plus-aosp

* commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe':
  Add dynamic uid info for tracking the sip service usage.
 2010-08-25 19:26:31 -07:00
Chung-yih Wang
ea52d35e56 Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread 2010-08-25 19:25:02 -07:00
Chung-yih Wang
5424c8dcac Add dynamic uid info for tracking the sip service usage. 
Change-Id: Ibc340401b63799326b08aee6eba602a3e753b13f
 2010-08-26 10:12:05 +08:00
Irfan Sheriff
c3bee43620 Merge "fix connectNetwork corner cases" 2010-08-25 18:23:47 -07:00
Daniel Sandler
525c664fbe Merge "System bar improvements." 2010-08-25 18:22:35 -07:00
Konstantin Lopyrev
261d509270 am 5a54e980: am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 
Merge commit '5a54e98022d640900f94102c077d8dff447f3c76'

* commit '5a54e98022d640900f94102c077d8dff447f3c76':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
 2010-08-25 17:41:02 -07:00
Chet Haase
ebe083efad Merge "Fix for end events from Sequencer objects" 2010-08-25 17:40:30 -07:00
Konstantin Lopyrev
5a54e98022 am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp

* commit '6947cc594276df899a0c4662224455f40846bd0a':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
 2010-08-25 17:37:45 -07:00
Konstantin Lopyrev
6947cc5942 Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 2010-08-25 17:35:50 -07:00
Chet Haase
673e42fafd Fix for end events from Sequencer objects 
Change-Id: I8947d8b016b880f9f54f2bf6ab22b4e188cdb29a
 2010-08-25 17:32:27 -07:00
Romain Guy
06b9a14c45 am d72c1172: am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread 
Merge commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa'

* commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa':
  reserve android.opengl.GLWallpaperService name for future use
 2010-08-25 17:32:00 -07:00
Romain Guy
d72c1172f6 am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread 
Merge commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb' into gingerbread-plus-aosp

* commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb':
  reserve android.opengl.GLWallpaperService name for future use
 2010-08-25 17:28:50 -07:00
Romain Guy
0c490839b2 Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread 2010-08-25 17:26:20 -07:00
Kenny Root
dc05980466 am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread 
Merge commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a'

* commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a':
  Add LFH offset to verbose list of APK
 2010-08-25 17:25:15 -07:00
Kenny Root
eb0e0f4651 am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread 
Merge commit '2e7427f39ec15dcb43cc1247372b53980be11d38' into gingerbread-plus-aosp

* commit '2e7427f39ec15dcb43cc1247372b53980be11d38':
  Add LFH offset to verbose list of APK
 2010-08-25 17:22:01 -07:00
Kenny Root
2e7427f39e Merge "Add LFH offset to verbose list of APK" into gingerbread 2010-08-25 17:20:29 -07:00
Mathias Agopian
f45b674d48 reserve android.opengl.GLWallpaperService name for future use 
Change-Id: I7a217593a1ca39214dda26ddb3af3ddc30a8a95a
 2010-08-25 16:57:02 -07:00
Jason Sams
d8cb3cadb5 Merge "Add matrix component types. Fix potental overflow in script -> java messages." 2010-08-25 16:54:56 -07:00
Dianne Hackborn
917d88213e am fde7fdd3: am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread 
Merge commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c'

* commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c':
  Fix a fun bug with multiple service bindings from an activity.
 2010-08-25 16:40:55 -07:00