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
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
Gilles Debunne
ed3cfb5e1b
Generated hdpi drawable size reduced
...
Change-Id: Id17bb27500ba8729c33613bbf457f1b3193ced38
2010-08-03 16:13:54 -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
Scott Main
e4f6728b2d
am fa32a45a: am f2d16bc5: am 5aa4680e: update device dashboard
...
Merge commit 'fa32a45af724f675215bff920dd264be4a9aae24'
* commit 'fa32a45af724f675215bff920dd264be4a9aae24':
update device dashboard
2010-08-03 15:52:43 -07:00
Steve Howard
c7ad9fa080
am 80782220: am 14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread
...
Merge commit '80782220708fdc8575502ac68c884ddab5c78ac2'
* commit '80782220708fdc8575502ac68c884ddab5c78ac2':
New secure setting for mobile download size limit.
2010-08-03 15:52:23 -07:00
Adam Powell
9d67668b9b
Merge "Add support for action buttons without an icon."
2010-08-03 15:51:25 -07:00
Alex Sakhartchouk
374b4d9091
Merge "Adding onscreen frame and script time for debugging."
2010-08-03 15:08:01 -07:00
Adam Powell
1f9c7afc5a
Add support for action buttons without an icon.
...
Change-Id: I026bb7463e7a73419dbaf79950d579ba05d04ea8
2010-08-03 15:01:31 -07:00
Charles Chen
c619d82796
Merge "Fixing font scale in WindowManagerService. There was a bug that causes WindowManagerService to lose the fontScale setting."
2010-08-03 14:50:09 -07:00
Nipun Kwatra
e618c893eb
Merge "Allowing useStillCameraForTimeLapse to be set through MediaRecorder.java"
2010-08-03 13:38:25 -07:00
Casey Burkhardt
0920ba5ef1
Fixing font scale in WindowManagerService.
...
There was a bug that causes WindowManagerService to lose
the fontScale setting.
This fix submitted on behalf of Casey Burkhardt.
Change-Id: I3a76de15adf13badc5efca8d620d14c972a96ec4
2010-08-03 12:22:47 -07:00
Alex Sakhartchouk
6de555001b
Adding onscreen frame and script time for debugging.
...
Change-Id: I5780092d14d49dae556b9969b937c7768e705a64
2010-08-03 12:03:16 -07:00
Chet Haase
d4b5020174
Merge "remove offending .pn file to fix build"
2010-08-03 11:58:53 -07:00
Chet Haase
4d031f6cc5
remove offending .pn file to fix build
...
Change-Id: I147f7f02e261c963ae93c15cbaab73b06f481f90
2010-08-03 11:56:27 -07:00
Mathias Agopian
d12a98e2b1
am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
...
Merge commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f' into gingerbread-plus-aosp
* commit '9abce39a991a6bc1cfab4284b5448a4f676bb06f':
fix [2421247] implement eglGetProcAddress(), needed in the ndk
2010-08-03 11:30:42 -07:00
Mathias Agopian
9abce39a99
Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
2010-08-03 11:29:15 -07:00
Konstantin Lopyrev
77c444dd2b
am 6fcf3a51: Merge "Improving profiling of views." into gingerbread
...
Merge commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8' into gingerbread-plus-aosp
* commit '6fcf3a518526d4f844830735ca1a2ae82a7500d8':
Improving profiling of views.
2010-08-03 11:26:25 -07:00
Konstantin Lopyrev
b59b120929
am 321f7fad: Making sure that there is no notification when focus changes from something to nothing.
...
Merge commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de' into gingerbread-plus-aosp
* commit '321f7fad5c4a6ef27e944dc72e2ddbfb61af81de':
Making sure that there is no notification when focus changes from something to nothing.
2010-08-03 11:26:21 -07:00
Konstantin Lopyrev
6fcf3a5185
Merge "Improving profiling of views." into gingerbread
2010-08-03 11:24:23 -07:00
Konstantin Lopyrev
321f7fad5c
Making sure that there is no notification when focus changes from something to nothing.
...
Change-Id: Ib8b3bdd7f5dd999c933a017fe1b34263afe38e4a
2010-08-03 11:21:55 -07:00
Dianne Hackborn
b1ad5977bc
New two-pane mode for PreferenceActivity.
...
This introduces a whole new way to use PreferenceActivity, as
a container for PreferenceFragments that the user can switch
between from a list of headers.
Change-Id: I1c79b7c78b86790dc460a1414a999aba5de80628
2010-08-03 11:18:23 -07:00
Jacek Surazski
ee9907b461
Merge "Add dumping of Running Service reports to ApplicationErrorReports"
2010-08-03 11:08:21 -07:00
Gilles Debunne
d1ce7496f1
Merge "frameworks/base/ : added scaled hdpi version of assets that were moved to drawable-mdpi"
2010-08-03 11:01:25 -07:00
Vasu Nori
6cd0cc4606
Merge "random but useful stuff"
2010-08-03 10:50:56 -07:00
Vasu Nori
0732f7912c
random but useful stuff
...
1. move binding of args to one place - to SQLiteProgram
2. reduce locking time in SQLiteDatabase
3. reduce locking during time of binding of args
4. rmeove test for the deprecated ArrayListCursor
5. a couple of nits here and there
Change-Id: I20c33c8ffe3325df67af655f1d20614f7f727cb7
2010-08-03 10:48:14 -07:00
Gilles Debunne
389878e49d
frameworks/base/ : added scaled hdpi version of assets that were moved to drawable-mdpi
...
Change-Id: I95c7e6afb84af981867c32fe7f86b140f643b5b9
2010-08-03 10:47:05 -07:00
Elliott Hughes
5515b54d92
Merge "Switch android.webkit.MimeTypeMap over to libcore.net.MimeUtils' table."
2010-08-03 10:45:35 -07:00
Maksymilian Osowski
5ce600e1dc
Merge "Added geolocation layoutTestController functions."
2010-08-03 10:38:12 -07:00
James Dong
246aad12cf
am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
...
Merge commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33' into gingerbread-plus-aosp
* commit '3d84280ccc31d12765e2efe03e2dd3ade1acfc33':
File writer has a designated writer thread now
2010-08-03 10:37:32 -07:00
Maksymilian Osowski
38f28fac14
Added geolocation layoutTestController functions.
...
Change-Id: Ie9558e873ff589b9e2358623433838f0718ea3b4
2010-08-03 18:37:17 +01:00
Michael Kolb
508654536c
Merge "fixed webkit version number in user agent string"
2010-08-03 10:36:25 -07:00
James Dong
3d84280ccc
Merge "File writer has a designated writer thread now" into gingerbread
2010-08-03 10:35:55 -07:00
Maksymilian Osowski
6540c26f58
Merge "Added recording of JS dialog messages."
2010-08-03 10:33:21 -07:00
Michael Kolb
11945d1f47
fixed webkit version number in user agent string
...
Change-Id: Ieb0843140a682d35bacc2bd273d7c697f02746a4
2010-08-03 10:25:07 -07:00
Alex Sakhartchouk
a275354c54
Merge "Adding drop shadow support"
2010-08-03 10:14:51 -07:00
James Dong
9b84e8df41
am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
...
Merge commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp
* commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668':
Fixed a typo in a method name of MediaPlayerPerformance.java class
2010-08-03 10:10:31 -07:00