Robert Greenwalt
63582a790e
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
...
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
Use CONNECTIVITY_INTERNAL for global proxy
2013-04-11 14:16:28 -07:00
Robert Greenwalt
ccbe7e6ff1
Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
2013-04-11 21:11:44 +00:00
Romain Guy
cf51a41998
Introduce PixelBuffer API to enable PBOs
...
PBOs (Pixel Buffer Objects) can be used on OpenGL ES 3.0 to perform
asynchronous texture uploads to free up the CPU. This change does not
enable the use of PBOs unless a specific property is set (Adreno drivers
have issues with PBOs at the moment, Mali drivers work just fine.)
This change also cleans up Font/FontRenderer a little bit and improves
performance of drop shadows generations by using memcpy() instead of
a manual byte-by-byte copy.
On GL ES 2.0 devices, or when PBOs are disabled, a PixelBuffer instance
behaves like a simple byte array. The extra APIs introduced for PBOs
(map/unmap and bind/unbind) are pretty much no-ops for CPU pixel
buffers and won't introduce any significant overhead.
This change also fixes a bug with text drop shadows: if the drop
shadow is larger than the max texture size, the renderer would leave
the GL context in a bad state and generate 0x501 errors. This change
simply skips drop shadows if they are too large.
Change-Id: I2700aadb0c6093431dc5dee3d587d689190c4e23
2013-04-11 14:07:34 -07:00
Benjamin Poiesz
39f96f95c3
Adding LocalePicker support for the zz_ZZ pseudolocale
...
Bug #8556677
Change-Id: I47244765b240f1ba66eadbef4ac712cf4367566e
2013-04-11 13:49:54 -07:00
Fabrice Di Meglio
dc25d25333
More fix for bug #8159072 Spinner widget should be RTL'ized
...
- fix DrawableContainerState.getChangingConfigurations() to take care about its children
- make Resources.verifyPreloadConfig() return false when the changing configuration
contains layout direction bits (this is when a Drawable is having different version
for LTR and RTL layout directions)
- use constant state instead of the resource type value for checking if we can
preload the drawable
- fix typo
Change-Id: Idd64caf0fbe0f5cfd5ffe09343e84bafa9446ea5
2013-04-11 13:38:57 -07:00
Nick Kralevich
c5931edb4c
am c65e4633: Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev
...
* commit 'c65e463356e9c8b646e80d0bfb6cfc76a0a1b426':
Optional <uses-permission> not yet supported.
2013-04-11 13:01:27 -07:00
Nick Kralevich
c65e463356
Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev
2013-04-11 19:56:55 +00:00
Jamie Gennis
8a675b9aca
am 6e8a2dd3: Merge "Trace: unhide app tracing APIs" into jb-mr2-dev
...
* commit '6e8a2dd3e66e65008a70fc09f6532b231d9b5f27':
Trace: unhide app tracing APIs
2013-04-11 12:50:10 -07:00
Jamie Gennis
6e8a2dd3e6
Merge "Trace: unhide app tracing APIs" into jb-mr2-dev
2013-04-11 19:47:25 +00:00
Scott Main
2f8caf6a74
am dac80f63: Merge "add api level 18 to javadoc \'since\' tags" into jb-mr2-dev
...
* commit 'dac80f633977308ec87cca1dea802e81d0fb75ad':
add api level 18 to javadoc 'since' tags
2013-04-11 12:03:54 -07:00
Scott Main
dac80f6339
Merge "add api level 18 to javadoc 'since' tags" into jb-mr2-dev
2013-04-11 19:01:01 +00:00
Scott Main
0b234469bf
am 873a39cd: am 6ca3484c: am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit '873a39cd3cc9f2319819cb94bc80a0e15a6d565b':
delete orphaned/redirected files
2013-04-11 11:53:14 -07:00
Scott Main
873a39cd3c
am 6ca3484c: am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit '6ca3484c3fb8ffd78bc67e2ded7687b11ec76b5e':
delete orphaned/redirected files
2013-04-11 11:47:46 -07:00
Scott Main
6ca3484c3f
am 430e0c77: am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit '430e0c77aae517bfe45700a81251864723719827':
delete orphaned/redirected files
2013-04-11 11:45:25 -07:00
Scott Main
430e0c77aa
am f24a3798: am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit 'f24a3798781719e99ce45373942f4199e748d59d':
delete orphaned/redirected files
2013-04-11 11:42:12 -07:00
Scott Main
f24a379878
am d17356b0: am f2f5b6ef: delete orphaned/redirected files
...
* commit 'd17356b0e23cf79eb1e0dd2f2fadbe4a7f56e886':
delete orphaned/redirected files
2013-04-11 11:39:43 -07:00
Scott Main
0d9e45a24e
add api level 18 to javadoc 'since' tags
...
Change-Id: Iea2e13ef2fad47d6a19d380b5655aeeda0414930
2013-04-11 11:37:29 -07:00
Scott Main
d17356b0e2
am f2f5b6ef: delete orphaned/redirected files
...
* commit 'f2f5b6ef987e30919907cf5417fb2b7cac9e2256':
delete orphaned/redirected files
2013-04-11 11:37:28 -07:00
Andreas Huber
7cd281c332
Document that MediaPlayer.getDuration() returns an invalid value (-1)
...
if no duration information was available.
Change-Id: If064627cca7915f4562b6d61bfd4ceb9a3c9390c
related-to-bug: 8596285
2013-04-11 11:09:06 -07:00
Andreas Huber
a57da0dc5a
MediaExtractor.setDataSource(...) has always thrown IOExceptions from
...
within jni code, but failed to document this fact. No more.
Change-Id: If55980616e974637209dea2b7a28b2481b55cea4
related-to-bug: 8470755
2013-04-11 10:54:55 -07:00
Jaikumar Ganesh
ea4f556f70
am 651f99cb: Merge "Sensor values changes." into jb-mr2-dev
...
* commit '651f99cb5588ccd313e2e532a6b9ccf9d679ff44':
Sensor values changes.
2013-04-11 10:53:23 -07:00
Jaikumar Ganesh
efda6203cd
am 28327210: Merge "Add new sensor types." into jb-mr2-dev
...
* commit '283272103bb6e0913c51c6b5c1de0f39608dd234':
Add new sensor types.
2013-04-11 10:53:21 -07:00
Jaikumar Ganesh
380043deb0
am 9a8df4dc: Add new sensor types.
...
* commit '9a8df4dcf9f83c1cf0cd8dedeb51d1ff8a52a2b5':
Add new sensor types.
2013-04-11 10:53:18 -07:00
Jaikumar Ganesh
651f99cb55
Merge "Sensor values changes." into jb-mr2-dev
2013-04-11 17:51:25 +00:00
Jaikumar Ganesh
283272103b
Merge "Add new sensor types." into jb-mr2-dev
2013-04-11 17:51:00 +00:00
Jaikumar Ganesh
6d0c1d78f1
Sensor values changes.
...
1. Remove Sensor Event Pool.
2. Allocate fixed array values for each Sensor added.
- Needed for backward compatibility.
3. Use SDK checks for backward compatibility for
rotation vector.
b/8165631
Change-Id: I2d2cf10d3460478ed7af8e6188343f4bb033503c
2013-04-11 10:25:35 -07:00
Jaikumar Ganesh
9a8df4dcf9
Add new sensor types.
...
1. Add uncalibrated gyros and magnetic field sensor.
2. Change max number of events from 3 to 16.
3. Add new APIs for trigger sensors.
Change-Id: Ifac5c0024c8e5f88b721e5cd97ff26afaaa36717
2013-04-11 10:25:35 -07:00
Nick Kralevich
32eb5b1824
Optional <uses-permission> not yet supported.
...
Change-Id: Ieaa97a29db75161f35905ff340b2c525bbf50612
2013-04-11 10:20:09 -07:00
The Android Open Source Project
8111f049a1
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ifb42e43150519a7abeb6f70ec4ae34f5f8a35220
2013-04-11 07:45:07 -07:00
The Android Automerger
8f38062b98
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-11 05:55:34 -07:00
Ben Murdoch
924ac51ea6
Deprectate WebViewDatabase password methods.
...
Bug: 8593749
Change-Id: I3d87fa43731a275af95f00933a5439d17a16ae80
2013-04-11 13:51:59 +01:00
Kenny Root
a3788b00bb
keystore: Add flag for blobs to be unencrypted
...
In order to let apps use keystore more productively, make the blob
encryption optional. As more hardware-assisted keystores (i.e., hardware
that has a Keymaster HAL) come around, encrypting blobs start to make
less sense since the thing it's encrypting is usually a token and not
any raw key material.
Bug: 8122243
Change-Id: If9af0d992d68edec006e630c687df3d03a7c9608
2013-04-10 23:36:13 -07:00
Matthew Xie
09e49980df
am f8a67f4f: Merge "Make BluetoothGattServer.close() public" into jb-mr2-dev
...
* commit 'f8a67f4f5dd4c5499a6e7148331f0286e31203ec':
Make BluetoothGattServer.close() public
2013-04-10 23:09:41 -07:00
Matthew Xie
f8a67f4f5d
Merge "Make BluetoothGattServer.close() public" into jb-mr2-dev
2013-04-11 06:07:33 +00:00
Tim Murray
4e8a3bcf03
am 3eba934a: Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-dev
...
* commit '3eba934a2747f71fa0aba2e1949567c786265359':
Clean up USAGE_SHARED and add syncing for USAGE_SHARED.
2013-04-10 21:56:04 -07:00
Tim Murray
3eba934a27
Merge "Clean up USAGE_SHARED and add syncing for USAGE_SHARED." into jb-mr2-dev
2013-04-11 04:50:32 +00:00
Scott Main
9908c6744e
am ef0066a8: am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit 'ef0066a8c35b29dcf308b8e51a664ce044e79f61':
add meta tags to the rest of the training classes
2013-04-10 19:35:55 -07:00
Scott Main
f2f5b6ef98
delete orphaned/redirected files
...
Change-Id: I6539076edf8962fd974d790a0edd1d4badc4d5f7
2013-04-10 19:31:56 -07:00
Scott Main
ef0066a8c3
am bc80d99b: am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit 'bc80d99bd9bbf747b42137a24d63a17f71e276d2':
add meta tags to the rest of the training classes
2013-04-10 19:30:08 -07:00
Scott Main
bc80d99bd9
am 55aa87b2: am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit '55aa87b2b36359441c3acb4222980fda8ba2c980':
add meta tags to the rest of the training classes
2013-04-10 19:25:59 -07:00
Amith Yamasani
b6812eabd4
am f900647a: Merge "Don\'t sync from adapters that haven\'t opted in to restricted accounts" into jb-mr2-dev
...
* commit 'f900647aa823165676d2fe9bcfcfc078d99649ab':
Don't sync from adapters that haven't opted in to restricted accounts
2013-04-10 19:25:36 -07:00
Scott Main
55aa87b2b3
am bd6b22d8: am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit 'bd6b22d8088df8d2c98e4d8f289ce0024164a1ad':
add meta tags to the rest of the training classes
2013-04-10 19:22:46 -07:00
Amith Yamasani
f900647aa8
Merge "Don't sync from adapters that haven't opted in to restricted accounts" into jb-mr2-dev
2013-04-11 02:21:37 +00:00
Scott Main
bd6b22d808
am 0cdbd5a5: am 1c2dea05: add meta tags to the rest of the training classes
...
* commit '0cdbd5a5b2b81cb5138ee62526689c2046b2a149':
add meta tags to the rest of the training classes
2013-04-10 19:19:14 -07:00
Scott Main
0cdbd5a5b2
am 1c2dea05: add meta tags to the rest of the training classes
...
* commit '1c2dea05492b23aa8f19c93fccedbe390e100297':
add meta tags to the rest of the training classes
2013-04-10 19:15:39 -07:00
Andre Eisenbach
3b64f38a16
Make BluetoothGattServer.close() public
...
This functino is needed for applications to un-register from the
Bluetooth stack.
bug 8591003
Change-Id: Id05f592245d1d90791d34c3617aadac67bc6502c
2013-04-10 19:13:10 -07:00
Adam Powell
90d8491df8
Permit null adapters in Spinners
...
Bug 8538144
Change-Id: I83f0ae78ce15f46827fb721cd0df1972b7d9d198
2013-04-10 19:08:24 -07:00
Mathias Agopian
fb01e4b634
Don't draw synchronously in onResume()
...
this could cause a dead-lock if the applicaltion's draw
implementation blocks until something happenson the main
ui thread.
note: we're still doing this synchronous draw in onWindowResize() because
that's what the previous implementation did. Technically, it has the
same problem.
Bug: 8586305
Change-Id: I782568289cc9419346aeea73775d86faa28b3058
2013-04-10 19:08:16 -07:00
Kristian Monsen
b5cd8c0a81
Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread
...
Mostly copied and pasted from the bug report.
Change-Id: I57cd19961f51fce266025d76ad9273a24f629c5b
2013-04-10 19:04:40 -07:00
Scott Main
1c2dea0549
add meta tags to the rest of the training classes
...
Change-Id: I4db0acee547b198db754eaf0e78062614ac6f59a
2013-04-10 18:59:29 -07:00