Oscar Montemayor
c4c9df3d71
Merge "Device Policy Manager changes to enable Global Proxy."
2010-08-04 16:25:01 -07:00
Irfan Sheriff
8525f5dc4a
Merge "Avoid hostname lookup in NetworkProperties"
2010-08-04 16:07:13 -07:00
Oscar Montemayor
69238c6a37
Device Policy Manager changes to enable Global Proxy.
...
Change-Id: I8489df7d28e4c5312e10d5cecc8e2a182413a034
2010-08-04 16:01:56 -07:00
Xia Wang
a69fbc8eff
Switch to new enum definition in RilCmds
...
Change-Id: Id6173d92a1c8d136b037448e2df55ea9ef49d34e
2010-08-04 15:39:24 -07:00
Romain Guy
42d530f18a
Merge "Fix native crash in SkiaShader."
2010-08-04 15:35:10 -07:00
Romain Guy
6c07daf86c
Fix native crash in SkiaShader.
...
Bug #2893733
Change-Id: I7feb9ab113fe0012cf9eb271f2b044f12a5c9c4e
2010-08-04 15:35:18 -07:00
Irfan Sheriff
1cf56ab9c6
Avoid hostname lookup in NetworkProperties
...
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05
2010-08-04 15:15:49 -07:00
Alex Sakhartchouk
f61f33dd38
Merge "Added ability to set font color. Propagating the name of meshes and allocations from native a3d to java"
2010-08-04 14:48:26 -07:00
Alex Sakhartchouk
fb10c16a05
Added ability to set font color.
...
Propagating the name of meshes and allocations from native a3d to java
Change-Id: If781f55340b5369459610e5e92ea69e240dcd24e
2010-08-04 14:45:48 -07:00
Nipun Kwatra
a8bd3a303e
Merge "Adding parseSizesList, getSupportedPreviewSizes to CameraParameters."
2010-08-04 14:23:54 -07:00
Brad Fitzpatrick
85d21bc6e1
am 9ee17b7d: am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread
...
Merge commit '9ee17b7dec7c76830b5add29f3b97039e178629a'
* commit '9ee17b7dec7c76830b5add29f3b97039e178629a':
Usage Stats: don't block writing stats to disk.
2010-08-04 14:07:55 -07:00
Nipun Kwatra
b70c1db70f
Adding parseSizesList, getSupportedPreviewSizes to CameraParameters.
...
Moved functionality to parse string of sizes from getSupportedPictureSizes
to parseSizesList.
Added getSupportedPreviewSizes which returns a list of supported preview sizes.
Change-Id: I435317427c1ee9623caef435f93e95d4476b7285
2010-08-04 14:04:07 -07:00
Chet Haase
bb688d6f37
Merge "Fix NPE in onAnimationEnd when using Sequencer.after(long)"
2010-08-04 13:58:52 -07:00
Patrick Dubroy
40771bc433
Fix NPE in onAnimationEnd when using Sequencer.after(long)
2010-08-04 13:49:39 -07:00
Jeff Hamilton
397e3a7bf7
Merge "Improve the documentation for the browser provider, and a few small cleanups."
2010-08-04 13:44:17 -07:00
Scott Main
53adc3c296
Merge "add droiddoc flag for honeycomb apis (for reference filtering)"
2010-08-04 13:35:39 -07:00
Jeff Hamilton
31d95db2cc
Improve the documentation for the browser provider, and a few small cleanups.
...
Change-Id: If6eb918ce4cdb09f74bd7eaaedf265d7981365ee
2010-08-04 15:26:25 -05:00
Daniel Sandler
b64ffdf0aa
Merge "Cleaning up the notification data structures."
2010-08-04 13:12:15 -07:00
Mike Lockwood
c3cc7011c2
Merge changes I085cb3cf,Ied1cddc6
...
* changes:
MTP: Add support for syncing MTP playlists
MTP: Fix some thread safety issues in MTP server start/stop sequence.
2010-08-04 13:02:06 -07:00
Vasu Nori
a7dd5eab33
requery() return value should be checked
...
if not checked and if the cursor continues to be used, it will result in
bug:2529736
Change-Id: I920f665643561374c2211acded6cc31fa8931909
2010-08-04 12:54:48 -07:00
Brett Chabot
f71925c84f
Merge "resolved conflicts for merge of 10928c37 to master"
2010-08-04 12:04:54 -07:00
Brett Chabot
f22e876393
resolved conflicts for merge of 10928c37 to master
...
Change-Id: Idbe91a2fe90cab0a03fdef096dc6741dc5937351
2010-08-04 12:03:46 -07:00
Chet Haase
df030d2c16
View x/y properties now feed into matrix translation
...
Change-Id: I35d8953ab6c7a511cdf90f3f94a4a1b5ef549fc3
2010-08-04 12:01:51 -07:00
Nipun Kwatra
bf3699a558
Unhide MediaRecorder::setTimeLapseParameters()
...
This function is used to enable time lapse video capture
and set the related parameters.
Change-Id: Ib6c4c107a92942d8e8fcce935d2c8542f8006cfb
2010-08-04 11:17:49 -07:00
James Dong
13f5b25c62
am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
...
Merge commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb'
* commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb':
Replace CHECK with a failure return value when mCamera->setParameters() fails
2010-08-04 11:12:40 -07:00
Chris Tate
5bac1cc0b8
am 9f6b16a2: am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
...
Merge commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4'
* commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4':
Enhanced VelocityTracker for > 5 pointers and fixed bugs.
2010-08-04 11:12:32 -07:00
Mathias Agopian
5fd174c99b
am d12a98e2: am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
...
Merge commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb'
* commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb':
fix [2421247] implement eglGetProcAddress(), needed in the ndk
2010-08-04 11:12:25 -07:00
Konstantin Lopyrev
bf0d12c2e2
am 77c444dd: am 6fcf3a51: Merge "Improving profiling of views." into gingerbread
...
Merge commit '77c444dd2bdc9bb2d54fc58420d263a83018190c'
* commit '77c444dd2bdc9bb2d54fc58420d263a83018190c':
Improving profiling of views.
2010-08-04 11:12:19 -07:00
Konstantin Lopyrev
2bf8028a23
am b59b1209: am 321f7fad: Making sure that there is no notification when focus changes from something to nothing.
...
Merge commit 'b59b120929f10c1501d27ebab2f69180868e9776'
* commit 'b59b120929f10c1501d27ebab2f69180868e9776':
Making sure that there is no notification when focus changes from something to nothing.
2010-08-04 11:12:13 -07:00
James Dong
26d7a6df73
am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
...
Merge commit '246aad12cf2becda5111d03fd1dd8f39712686f2'
* commit '246aad12cf2becda5111d03fd1dd8f39712686f2':
File writer has a designated writer thread now
2010-08-04 11:12:03 -07:00
James Dong
327c0bd9e2
am 9b84e8df: am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
...
Merge commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80'
* commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80':
Fixed a typo in a method name of MediaPlayerPerformance.java class
2010-08-04 11:11:50 -07:00
Adam Powell
4be0d52125
Added android.widget.PopupMenu
...
Change-Id: Id507cf93ebd0484f141a0a44266b883c01aa10db
2010-08-04 11:06:22 -07:00
Romain Guy
529b60a3b1
Add android:hardwareAccelerated to Activity.
...
Hardware acceleration can now be enabled/disabled locally on each activity
declared in the manifest. It can also be enabled/disabled directly on a
window through the WindowManager.LayoutParams.
Change-Id: I91dd0b26c4e7eb8cd7288e523ed6b7bda6d0990b
2010-08-04 10:55:46 -07:00
Alex Sakhartchouk
cf9a44cdf3
Adding matrix class methods.
...
Change-Id: I597b1b3955e29921394909f302800034571e6a50
2010-08-04 10:48:30 -07:00
Scott Main
02a09927cc
add droiddoc flag for honeycomb apis (for reference filtering)
...
Change-Id: I711b71cbb914cbe9b6bcf7feae55332b1f3fa1c1
2010-08-04 10:32:25 -07:00
Kristian Monsen
0d523e09bd
Merge "Update Browser useragent string to reflect WebKit merge at r64264"
2010-08-04 04:58:22 -07:00
Kristian Monsen
d468e50bce
Merge "After merging webkit to 64264 these hang, so added them to the do not run list. The tests timeout on chrome and are on the chrome skiplist."
2010-08-04 04:58:09 -07:00
Kristian Monsen
bc3008bd73
Update Browser useragent string to reflect WebKit merge at r64264
...
Change-Id: Ic29d7b918b179d99c16150bd0aec2f09d5707408
2010-08-04 10:50:26 +01:00
Gilles Debunne
8a3f95dd4b
Merge "Generated hdpi drawable size reduced"
2010-08-03 18:39:31 -07:00
Brett Chabot
412ae2b4df
Merge "Fix Framework core tests import of android-common."
2010-08-03 17:59:08 -07:00
Brett Chabot
672079a75a
Fix Framework core tests import of android-common.
...
android.database.CursorWindowTest#testWriteCursorToWindow (and possibly other
tests) were was failing because it couldn't locate a android-common class.
Fix is to include android-common as a static library, as opposed to a runtime
library.
Change-Id: Iae50cf409e76a85ee79e4af71e9b903d18630078
2010-08-03 17:28:19 -07:00
Dianne Hackborn
b3cf10ffa8
Add facility to switch to new fragments from preferences.
...
Change-Id: I009315b59cf81b4962e9c5a4490f0f82743ed64a
2010-08-03 17:07:45 -07:00
Brad Fitzpatrick
9ee17b7dec
am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread
...
Merge commit '866362fcb4db93584143c21934ea355cbf9e0757' into gingerbread-plus-aosp
* commit '866362fcb4db93584143c21934ea355cbf9e0757':
Usage Stats: don't block writing stats to disk.
2010-08-03 17:00:20 -07:00
Brad Fitzpatrick
866362fcb4
Merge "Usage Stats: don't block writing stats to disk." into gingerbread
2010-08-03 16:57:47 -07:00
Gilles Debunne
ed3cfb5e1b
Generated hdpi drawable size reduced
...
Change-Id: Id17bb27500ba8729c33613bbf457f1b3193ced38
2010-08-03 16:13:54 -07:00
Brett Chabot
10928c37f1
am c458b2ca: Merge "Frameworks core tests size cleanup." into gingerbread
...
Merge commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4' into gingerbread-plus-aosp
* commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4':
Frameworks core tests size cleanup.
2010-08-03 16:04:03 -07:00
Brett Chabot
c458b2cab3
Merge "Frameworks core tests size cleanup." into gingerbread
2010-08-03 16:02:09 -07:00
James Dong
d152c1c753
am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
...
Merge commit 'd194f3d68188a0993617ba8cc29d8abd381b6069' into gingerbread-plus-aosp
* commit 'd194f3d68188a0993617ba8cc29d8abd381b6069':
Replace CHECK with a failure return value when mCamera->setParameters() fails
2010-08-03 15:57:26 -07:00
James Dong
d194f3d681
Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
2010-08-03 15:54:32 -07:00
James Dong
6c8687cf1e
am 51a260d8: am 23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread
...
Merge commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef'
* commit '51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef':
Add lost frame handling in AudioSource
2010-08-03 15:52:48 -07:00