Eric Laurent
2ad398bba5
am bec4abaa: Merge "Fix issue 3302649." into gingerbread
...
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
Fix issue 3302649.
2011-01-12 13:52:42 -08:00
Eric Laurent
9e41414cd5
Merge "Fix issue 3302649." into gingerbread
2011-01-12 13:50:51 -08:00
Justin Ho
65c8b1a5b2
am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
...
* commit '7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
Updated flightmode assets
2011-01-12 13:50:25 -08:00
Justin Ho
a7498c90b9
Merge "Updated flightmode assets" into gingerbread
2011-01-12 13:47:59 -08:00
Jason Sams
e5dae8ed72
am 8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb
...
* commit '8f597fdfacd1b9cda6dfebf4f3a1c34d1ffb5b2f':
Cleanup bitmap uploads Implement standalone mipmap generation.
2011-01-12 13:33:22 -08:00
Jason Sams
13fda1acb6
Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb
2011-01-12 13:30:41 -08:00
Amith Yamasani
6ae5b586f0
am fb0a242b: Merge "Use light preference panel drawable for Theme.Light" into honeycomb
...
* commit 'fb0a242be65e4ddbda0cbaec1ac949d29568ac25':
Use light preference panel drawable for Theme.Light
2011-01-12 13:20:04 -08:00
Amith Yamasani
8a61739fed
Merge "Use light preference panel drawable for Theme.Light" into honeycomb
2011-01-12 13:18:20 -08:00
Jim Miller
bb894c6977
am a3a078e3: Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb
...
* commit 'a3a078e34317763ad1294e0164c147074584e2e8':
Fix 3201849: Use custom Drawable for bg in lockscreen
2011-01-12 13:16:56 -08:00
Jim Miller
b4e50e1206
Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb
2011-01-12 13:14:33 -08:00
Dianne Hackborn
6b2d4b4a8f
am 02e852f9: Merge "Make ProgressDialog a little less lame." into honeycomb
...
* commit '02e852f968bac83947cd97a5fe7c7a7064774c5a':
Make ProgressDialog a little less lame.
2011-01-12 13:01:42 -08:00
Jason parks
d2c382ed0f
Remove the APIs for the old encryption scheme.
...
Change-Id: I55116a5b29b10dfd50015805ec019b485257f68b
2011-01-12 15:01:34 -06:00
Dianne Hackborn
6bbe877e72
Merge "Make ProgressDialog a little less lame." into honeycomb
2011-01-12 12:59:27 -08:00
Romain Guy
192b8133b2
am 85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb
...
* commit '853548287ffe4eb85d1bd10669270292336d137a':
Cleanup GL objects on the correct thread.
2011-01-12 12:52:41 -08:00
Romain Guy
a034863a11
Merge "Cleanup GL objects on the correct thread." into honeycomb
2011-01-12 12:50:50 -08:00
Romain Guy
92273803b4
am cf894c91: Merge "Fix CTS test. Bug #3345445 " into honeycomb
...
* commit 'cf894c91a9b6c7749c9bb325c9e54336b97df900':
Fix CTS test. Bug #3345445
2011-01-12 12:49:35 -08:00
Romain Guy
b2262c91c6
Merge "Fix CTS test. Bug #3345445 " into honeycomb
2011-01-12 12:47:30 -08:00
Kenny Root
e433d745a9
am 5e9ba49f: Merge "Skip SD card tests on devices without SD cards" into honeycomb
...
* commit '5e9ba49f5efed4f0adc7ffcf5052668cdfd92a25':
Skip SD card tests on devices without SD cards
2011-01-12 12:30:17 -08:00
Kenny Root
fd71d288cf
Merge "Skip SD card tests on devices without SD cards" into honeycomb
2011-01-12 12:28:39 -08:00
Jaikumar Ganesh
ddabf8a40e
am 95a4751f: Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb
...
* commit '95a4751f2111d5d7c03c131e9d9dfad6cc32ceed':
Add ability to parse keyboard fixed pin auto pair blacklist.
2011-01-12 12:25:01 -08:00
Jaikumar Ganesh
c64f23300d
am fc019bd4: Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb
...
* commit 'fc019bd4fa3004ec8e287fee0d277db666891ca3':
Revert "Add temporary hack for keyboards not following spec."
2011-01-12 12:24:57 -08:00
Jaikumar Ganesh
1ed008bf08
Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb
2011-01-12 12:22:57 -08:00
Jaikumar Ganesh
3712282e0a
Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb
2011-01-12 12:22:50 -08:00
Leon Scroggins
e0e6340338
am 1415bb7a: Merge "Differentiate between clicks for focus and actual clicks." into honeycomb
...
* commit '1415bb7a948e0add9f6beb6dccbea70e9d2bedd0':
Differentiate between clicks for focus and actual clicks.
2011-01-12 12:03:24 -08:00
Leon Scroggins
7db98c291c
Merge "Differentiate between clicks for focus and actual clicks." into honeycomb
2011-01-12 12:01:31 -08:00
Kenny Root
ee1695eb6e
am b5a4b5d3: Merge "Allow updated system apps to retain priority" into honeycomb
...
* commit 'b5a4b5d300bc05a969181155a4f155a79241f792':
Allow updated system apps to retain priority
2011-01-12 12:00:13 -08:00
Kenny Root
37c43e2298
am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
...
* commit '6688b6c31765242866fc276cea7fa241fc5b5e7b':
Allow updated system apps to retain priority
2011-01-12 11:59:49 -08:00
Kenny Root
211d93f4df
Merge "Allow updated system apps to retain priority" into honeycomb
2011-01-12 11:58:11 -08:00
Kenny Root
c31a45058e
Merge "Allow updated system apps to retain priority" into gingerbread
2011-01-12 11:56:25 -08:00
James Dong
1b91726b6d
am cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycomb
...
* commit 'cb0f6d0b42b264ec6aa2a98fe210d72ed10f73ed':
Speed up MP3Extractor using cached reads
2011-01-12 11:56:01 -08:00
Alex Sakhartchouk
ef820e05fe
am 27d11608: Merge "Adding ability to load cubemaps from individual faces." into honeycomb
...
* commit '27d116085ebbb112ec1fd959763a027ec08f7179':
Adding ability to load cubemaps from individual faces.
2011-01-12 11:55:54 -08:00
James Dong
8a27bdcea1
Merge "Speed up MP3Extractor using cached reads" into honeycomb
2011-01-12 11:54:32 -08:00
Alex Sakhartchouk
32258245f4
Merge "Adding ability to load cubemaps from individual faces." into honeycomb
2011-01-12 11:53:42 -08:00
Jamie Gennis
235c424c9a
Fix a bug in SurfaceTexture::dequeueBuffer.
...
This change fixes a bug that allowed the most recently queued buffer to
be returned by dequeueBuffer. At the next updateTexImage call, the
dequeued buffer would be set as the contents of the texture even though
the client could be writing to it.
Change-Id: I53dc14eed13262475627d5551337df57fd78fe00
2011-01-12 11:28:38 -08:00
Jamie Gennis
f238e28500
Implement crop & transform for SurfaceTexture.
...
This change adds support for the setCrop and setTransform methods of the
SurfaceTexture C++ class. The crop and transform for the current
texture will be accessed by applications as a single texture coordinate
transform matrix.
Change-Id: I6482bf96f680e5c175364e848936db3908d6c8f8
2011-01-12 11:28:38 -08:00
Kristian Monsen
be4af1fecd
am 7a8f01ab: Merge "Add a static method to get the InputStream of a content URL" into honeycomb
...
* commit '7a8f01abf98b6212358ea0e0401879093d2c0f93':
Add a static method to get the InputStream of a content URL
2011-01-12 11:17:13 -08:00
Kristian Monsen
9dadbdf0bd
am 6c5e4dc2: Merge "Adding a static method to get the size of a content url" into honeycomb
...
* commit '6c5e4dc2312f0b6a3c02972c382d5a047793e734':
Adding a static method to get the size of a content url
2011-01-12 11:17:11 -08:00
Kristian Monsen
3c35a329b3
Merge "Add a static method to get the InputStream of a content URL" into honeycomb
2011-01-12 11:15:20 -08:00
Kristian Monsen
d9face92ee
Merge "Adding a static method to get the size of a content url" into honeycomb
2011-01-12 11:15:09 -08:00
Michael Jurka
e911b658f6
am b609881f: Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
...
* commit 'b609881fb0f27c7e6fd3ec955a35d2c78a5852ab':
Add sym_def_app_icon to mipmap directory
2011-01-12 11:08:28 -08:00
Michael Jurka
c9a8dc97a6
Merge "Add sym_def_app_icon to mipmap directory" into honeycomb
2011-01-12 11:06:44 -08:00
Chet Haase
1b5ca7d86f
am 535d5eda: Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
...
* commit '535d5edad225a2855e952a1883310c4a0fa43b72':
New interpolator resources now found in interpolator/ directory
2011-01-12 11:04:22 -08:00
Chet Haase
f3ec504c02
Merge "New interpolator resources now found in interpolator/ directory" into honeycomb
2011-01-12 11:01:50 -08:00
Huahui Wu
9dbb687c82
am 342bfbf9: Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb
...
* commit '342bfbf94fa806be8fefa7ff905ba0a0b0b98df0':
b/3340946 Fix NPE caused by null gesture detector.
2011-01-12 10:59:22 -08:00
Huahui Wu
46ff1c4b1c
Merge "b/3340946 Fix NPE caused by null gesture detector." into honeycomb
2011-01-12 10:57:51 -08:00
Dianne Hackborn
49573f88ef
am 6014527c: Add "min size" facility to the Window class.
...
* commit '6014527c350895383b99ba91d3d009a32b1d22a6':
Add "min size" facility to the Window class.
2011-01-12 10:39:58 -08:00
Andreas Huber
0955e052f9
am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
...
* commit '7c6153606cc963191362494c8cb5669749e84326':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 10:35:18 -08:00
Patrick Scott
620f5da650
am 92a9a3c5: Merge "Do not merge." into honeycomb
...
* commit '92a9a3c5ef9774863b4cee93d43b67582a02c2f0':
Do not merge.
2011-01-12 09:47:09 -08:00
Patrick Scott
fdadb0cbdf
Merge "Do not merge." into honeycomb
2011-01-12 09:44:59 -08:00
Glenn Kasten
e2a0409096
am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
...
* commit 'e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
Fix race in buffer ref counting.
2011-01-12 09:36:00 -08:00