Steve Block
72498edd88
Update JavaDoc for PictureListener after fix to capture layers
...
Bug: 6389297
Change-Id: I970942f926effbb072ae306c994d25c0e77e3810
2012-07-19 17:02:06 +01:00
The Android Open Source Project
d2299ca8a2
am 67144427: Reconcile with jb-mr0-release jb-release
...
* commit '6714442782cc96bfd6c88e8a4f1fa8659d146da7':
Preserve retryCount when retrying.
When reconnecting disassociate dc and apnContext.
Handle keyguard visibility states separately. DO NOT MERGE
2012-07-19 08:52:17 -07:00
The Android Open Source Project
6714442782
Reconcile with jb-mr0-release jb-release
...
Change-Id: I0249d315e647dcdc2f3dea4d258ef5bf2065731d
2012-07-19 08:37:10 -07:00
Satoshi Kataoka
4e5184f929
Fix a crash in InputMethodManager when switching the IME in the system process
...
Bug: 6789252
Change-Id: I66f51da1299532793ef8fa700f35b0811670f235
2012-07-19 20:32:51 +09:00
John Grossman
ecedbf9e04
am c43a685c: (-s ours) Merge "Change audio flinger to user HAL master mute if available: DO NOT MERGE" into ics-aah
...
* commit 'c43a685c3027791b21294a2ef423a6129cb49ad4':
Change audio flinger to user HAL master mute if available: DO NOT MERGE
2012-07-19 00:39:29 -07:00
Brian Carlstrom
0b9361d5f9
am ee2585e5: am 553e3898: Merge "Improve test key names to reproduce public issue" into jb-dev
...
* commit 'ee2585e5bce29f90eebaf2ce32826fa75dac17cf':
Improve test key names to reproduce public issue
2012-07-19 00:26:19 -07:00
Brian Carlstrom
ee2585e5bc
am 553e3898: Merge "Improve test key names to reproduce public issue" into jb-dev
...
* commit '553e3898c0ae5f7344d84279c7d425ffbeb6a90d':
Improve test key names to reproduce public issue
2012-07-18 23:07:50 -07:00
Brian Carlstrom
553e3898c0
Merge "Improve test key names to reproduce public issue" into jb-dev
2012-07-18 23:05:28 -07:00
The Android Automerger
0adcd141c0
merge in jb-mr0-release history after reset to jb-dev
2012-07-18 21:44:46 -07:00
Romain Guy
9cf6f6e71d
Merge "Optimize gradient textures"
2012-07-18 20:43:05 -07:00
Romain Guy
eb61cd8296
Optimize gradient textures
...
Compute the size of the backing textures based on the maximum possible
number of shades in the gradient.
Change-Id: I2d7f20477d31b81e9735f2c1d83ebdd0dbcbe340
2012-07-18 20:39:45 -07:00
James Dong
c64c1cbef4
am d1a0a53e: am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev
...
* commit 'd1a0a53eec141b615697652b3a8907a60298a414':
Changed to obtain a parcel in each notify() call in jni.
2012-07-18 20:18:41 -07:00
Ying Wang
ee443b2819
am d173b10a: (-s ours) am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'd173b10a930b56cfd71ca36d0051230b3f9593c1':
Import translations. DO NOT MERGE
2012-07-18 20:18:36 -07:00
Scott Main
fb6cdc6434
am f80ba4a5: am 12a54752: docs: update hw accel attribute\'s default behavior and fix link to l10n tutorial
...
* commit 'f80ba4a5dc46e8dfa30de8e5facb15a7cffa480a':
docs: update hw accel attribute's default behavior and fix link to l10n tutorial
2012-07-18 20:18:32 -07:00
Daniel Sandler
d290c9d1a4
am f22beb3f: am 0038ec11: Merge "Fix stuck status bars." into jb-dev
...
* commit 'f22beb3f2fae39568d1576254e4733c089da16f3':
Fix stuck status bars.
2012-07-18 20:18:27 -07:00
Dirk Dougherty
aca00fdd26
am a482028e: am a44794f4: Merge "Doc change: add button link to developer console." into jb-dev
...
* commit 'a482028ed0d3cc40a67f06ded6db7b58b9b5462a':
Doc change: add button link to developer console.
2012-07-18 20:18:22 -07:00
Joe Fernandez
a0e9c7fc97
am 22f742e6: am 23369747: Merge "docs: Updating <uses-sdk> docs, bug fix: b/6836256" into jb-dev
...
* commit '22f742e61ac9ebaedcc20adbd7f13ae6cbce98f4':
docs: Updating <uses-sdk> docs, bug fix: b/6836256
2012-07-18 20:18:18 -07:00
Romain Guy
f1fae63160
am 243924b0: am 3409e728: Correctly pre-clip paths when recording display lists Bug #6836448 External bug: http://code.google.com/p/android/issues/detail?id=34946
...
* commit '243924b08f9fbcc7f1e46d24df986c25fba3eb18':
Correctly pre-clip paths when recording display lists Bug #6836448 External bug: http://code.google.com/p/android/issues/detail?id=34946
2012-07-18 20:18:12 -07:00
Scott Main
3c0c7fae77
am 5b4d4348: am 634ccf7e: Merge "docs: fix broken links" into jb-dev
...
* commit '5b4d4348f46ef689f0bafceb64c9855881efb8ba':
docs: fix broken links
2012-07-18 20:18:07 -07:00
Joe Fernandez
178e8f2044
am 69dcb0da: am c98a56de: Merge "docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes" into jb-dev
...
* commit '69dcb0dab5c675397501aac87f6ee41d0a735325':
docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes
2012-07-18 20:18:01 -07:00
Robert Greenwalt
efee889fa4
am cf7d4400: Merge commit \'c8cb059f\' into manualmerge
...
* commit 'cf7d4400f0f05e87138cea2ad2998aa9e320e4ec':
Fix our interpretation of apn setting's bearer.
2012-07-18 20:15:12 -07:00
James Dong
d1a0a53eec
am 5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev
...
* commit '5d478b9c1009b077649f7f870d993832d380d63c':
Changed to obtain a parcel in each notify() call in jni.
2012-07-18 20:15:11 -07:00
Ying Wang
d173b10a93
am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'a4d4df16a6d18add37971bbd41ba58b4ce2ee608':
Import translations. DO NOT MERGE
2012-07-18 20:14:46 -07:00
Scott Main
f80ba4a5dc
am 12a54752: docs: update hw accel attribute\'s default behavior and fix link to l10n tutorial
...
* commit '12a5475205243bc2d069a87d2c7d4982b5f4d11d':
docs: update hw accel attribute's default behavior and fix link to l10n tutorial
2012-07-18 20:14:39 -07:00
Daniel Sandler
f22beb3f2f
am 0038ec11: Merge "Fix stuck status bars." into jb-dev
...
* commit '0038ec1107baf179a54a2f10b6643f918b1e7059':
Fix stuck status bars.
2012-07-18 20:14:33 -07:00
Dirk Dougherty
a482028ed0
am a44794f4: Merge "Doc change: add button link to developer console." into jb-dev
...
* commit 'a44794f45e46cec0f23a690480274aad171775d2':
Doc change: add button link to developer console.
2012-07-18 20:14:28 -07:00
Joe Fernandez
22f742e61a
am 23369747: Merge "docs: Updating <uses-sdk> docs, bug fix: b/6836256" into jb-dev
...
* commit '233697471689a41a36f69cc9bda1e663d2f67804':
docs: Updating <uses-sdk> docs, bug fix: b/6836256
2012-07-18 20:14:24 -07:00
Romain Guy
243924b08f
am 3409e728: Correctly pre-clip paths when recording display lists Bug #6836448 External bug: http://code.google.com/p/android/issues/detail?id=34946
...
* commit '3409e728e22609b54de8b33d1e614ca51f6d6a77':
Correctly pre-clip paths when recording display lists Bug #6836448 External bug: http://code.google.com/p/android/issues/detail?id=34946
2012-07-18 20:14:02 -07:00
Scott Main
5b4d4348f4
am 634ccf7e: Merge "docs: fix broken links" into jb-dev
...
* commit '634ccf7eb80046749df2f8f30ec3d4dc23fa3457':
docs: fix broken links
2012-07-18 20:13:56 -07:00
Joe Fernandez
69dcb0dab5
am c98a56de: Merge "docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes" into jb-dev
...
* commit 'c98a56de61263b25920dbdc7fa9396c91ecbce7d':
docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes
2012-07-18 20:13:47 -07:00
Romain Guy
9fc7979bda
Merge "Remove vendor specific precision qualifier"
2012-07-18 20:11:09 -07:00
Romain Guy
6355347813
Remove vendor specific precision qualifier
...
Change-Id: I0a56ca7a5a399ec94993d3cea0c4aff6c0f86e39
2012-07-18 20:04:14 -07:00
Romain Guy
f82e22db88
Merge "Note to self"
2012-07-18 19:17:53 -07:00
Romain Guy
8e025de5fb
Note to self
...
Change-Id: Ic5699bdbf880ad68748c827bb5b4976b12d4d413
2012-07-18 19:12:11 -07:00
James Dong
5d478b9c10
Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev
2012-07-18 18:43:37 -07:00
Mathias Agopian
d48a84cea5
Merge "Updated OpenGL bindings to fix nio buffer crash"
2012-07-18 18:31:28 -07:00
Mathias Agopian
73664e500a
Merge "EGL 1.4 API without @hide"
2012-07-18 18:30:04 -07:00
Romain Guy
04299385c6
Clip lines, AA rects and points correctly
...
Change-Id: I900dd986f397b66f133e6021aa4c2539e7abc2b9
2012-07-18 17:15:41 -07:00
Romain Guy
dfab50d8b9
Tweak text gamma correction
...
Change-Id: Icd3326e6a054d6020c3ed61c8459394bc87401dd
2012-07-18 17:06:37 -07:00
Romain Guy
2e6f5ca77b
Merge "Add a new method for text gamma correction"
2012-07-18 16:31:59 -07:00
Romain Guy
6e25e38e43
Add a new method for text gamma correction
...
To select the gamma correction method, adb shell setprop hwui.text_gamma_correction
with one of the following values:
lookup3
lookup
shader3
shader
See Properties.h for more information about these different methods.
You can also control gamma correction using the following properties:
hwui.text_gamma
hwui.text_gamma.black_threshold
hwui.text_gamma.white_threshold
Change-Id: I47970b804d2c590c37d3da5008db094241579e25
2012-07-18 16:28:44 -07:00
Raph Levien
592b29f4ad
Merge "Increase text layout cache size in bytes"
2012-07-18 16:20:20 -07:00
Fabrice Di Meglio
9a1aa4c4a4
Merge "Fix padding resolution"
2012-07-18 16:17:31 -07:00
Raph Levien
161ebab85d
Increase text layout cache size in bytes
...
The mark positioning changes increase the number of bytes needed per
glyph from 6 to 14. This patch compensates by allocating more total
memory for the text layout cache.
Change-Id: I3cf59547394a41779cf6e92e67688b0fdc85f1a3
2012-07-18 16:16:41 -07:00
Fabrice Di Meglio
016456e432
Fix padding resolution
...
Change-Id: I2181a0a4057be0d20744b1512dbc1fbc53490d81
2012-07-18 16:14:57 -07:00
Raph Levien
4f3c8f7026
Fix overly verbose logging in TextLayoutCache
...
I meant to log certain debug values only when DEBUG_GLYPHS was set, but
I used #ifdef instead of #if (when it's not set, it's 0, rather than
undefined).
Change-Id: Ic27fee7dd355009c1873f0a2e12614849bbceebd
2012-07-18 15:40:44 -07:00
John Grossman
c43a685c30
Merge "Change audio flinger to user HAL master mute if available: DO NOT MERGE" into ics-aah
2012-07-18 15:34:26 -07:00
Ying Wang
0734102f44
Merge "Import translations. DO NOT MERGE"
2012-07-18 14:58:43 -07:00
Ying Wang
a4d4df16a6
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-07-18 14:58:18 -07:00
Naveen Kalla
93cb0dd3b2
Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony
...
This test was missed out while migrating telephony to frameworks/opt.
Change-Id: I75d5bfef81352ebb916b3a4b3e482550478b797b
2012-07-18 14:51:11 -07:00