James Dong
14bdce0441
Merge "Remove legacy code that should not be used" into honeycomb
2011-01-12 16:39:43 -08:00
James Dong
4507cef05e
Remove legacy code that should not be used
...
Change-Id: I9209e3a32b64a30627848d2a425f32ed6b73e8a2
2011-01-12 16:38:45 -08:00
Nick Pelly
18adceb427
am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
...
* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
New Intent defined for RF ON/OFF events
2011-01-12 16:33:48 -08:00
Nick Pelly
a29bf14e1d
Merge "New Intent defined for RF ON/OFF events" into gingerbread
2011-01-12 16:28:59 -08:00
daniel_tomas
200ca02fca
New Intent defined for RF ON/OFF events
...
Change-Id: Ie1bc056bd36eb999b4678c594a3edc801a0cf6a1
2011-01-12 16:28:34 -08:00
Romain Guy
703b0bc953
am d6b13534: Merge "Only enable GL rendering on the main thread." into honeycomb
...
* commit 'd6b13534d44faee5bf80eb02495c17aa0195d381':
Only enable GL rendering on the main thread.
2011-01-12 16:24:27 -08:00
Romain Guy
d6b13534d4
Merge "Only enable GL rendering on the main thread." into honeycomb
2011-01-12 16:22:48 -08:00
Romain Guy
4f6aff3860
Only enable GL rendering on the main thread.
...
Change-Id: I41950f4c0a5063ee5d6950cf137eb60a1c7a72fe
2011-01-12 16:21:41 -08:00
Amith Yamasani
bf546169a2
am e1c99a1f: Merge "Remove popup indicator for dialog style preference items." into honeycomb
...
* commit 'e1c99a1f5bb86066d2e9ea48b27cf60d1b78544b':
Remove popup indicator for dialog style preference items.
2011-01-12 16:00:59 -08:00
Xavier Ducrohet
56222cfbe9
LayoutLib: use tags in logs.
...
Change-Id: Ib85272249d285ecef409bf063903bcd91514a424
2011-01-12 15:59:49 -08:00
Brad Fitzpatrick
54f428a63f
am bdb7aee0: Merge "Fix for crash when setting live wallpaper."
...
* commit 'bdb7aee0a4934eb138f7caaf921f6c86f350b4b7':
Fix for crash when setting live wallpaper.
2011-01-12 15:59:44 -08:00
Amith Yamasani
e1c99a1f5b
Merge "Remove popup indicator for dialog style preference items." into honeycomb
2011-01-12 15:59:02 -08:00
Robert Greenwalt
19b9ab46a9
Turn off DUN connection after tethering.
...
Use matching feature type when turning tethering off or the request is ignored.
Also, turn on DUN apn right away so that we don't fail aggressive test cases.
Also don't report connections for enabled apn's that we're no longer connected to.
bug:3332880
bug:3338033
Change-Id: I7db2dfd4879f03465bc9f6d39488c078570dcaf3
2011-01-12 15:52:10 -08:00
Joe Onorato
0220736e85
am 895eee7b: Merge "Remove the volume slider in SystemUI." into honeycomb
...
* commit '895eee7bac7dad66b51406d23529bec1dc9ad901':
Remove the volume slider in SystemUI.
2011-01-12 15:48:45 -08:00
Joe Onorato
895eee7bac
Merge "Remove the volume slider in SystemUI." into honeycomb
2011-01-12 15:47:08 -08:00
Joe Onorato
d7cbe592dd
Remove the volume slider in SystemUI.
...
Bug: 3344667
Change-Id: I8701fadac1736c73fbecb6f50d2ced7bba2c559c
2011-01-12 15:45:20 -08:00
Brad Fitzpatrick
bdb7aee0a4
Merge "Fix for crash when setting live wallpaper."
2011-01-12 15:45:05 -08:00
Gilles Debunne
a39301b1d0
am 95a95717: New menu_dropdown_panel assets.
...
* commit '95a9571702e64857e7d8d7dc6c8a46caec874a6b':
New menu_dropdown_panel assets.
2011-01-12 15:42:43 -08:00
Gilles Debunne
95a9571702
New menu_dropdown_panel assets.
...
Bug 3330307.
The content region has been extended by one pixel.
Change-Id: I18bcc9af28a210dae8564a7463d21a896314cba4
2011-01-12 15:36:47 -08:00
Martijn Coenen
89bc23783f
am 261fa998: am 25be5365: Implement canMakeReadonly().
...
* commit '261fa99890ebd1ea15a6067859b0e931a3009859':
Implement canMakeReadonly().
2011-01-12 15:31:07 -08:00
James Dong
4fbf60e724
am 0569e589: (-s ours) am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
...
* commit '0569e58988bae5f08733e21e8d8adfa61fe89b7f':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
2011-01-12 15:31:01 -08:00
Nick Pelly
167ac43559
am 6b9db1d8: am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
...
* commit '6b9db1d8c808439abc12d572283b7fab50fb5257':
Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-12 15:30:53 -08:00
Nick Pelly
6d4372c3f4
am 19326cdc: (-s ours) am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
...
* commit '19326cdcbf551728c54a844ddebe03b0f5d8d268':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-12 15:30:41 -08:00
Jason Sams
b7ec54699f
am ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
...
* commit 'ef56ee316cc361cd6519810ae3ae1051ed6fc79b':
WAR driver bug where surfaces of size 0 fail.
2011-01-12 15:30:18 -08:00
Huahui Wu
f6a63f95a8
am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
...
* commit '558730510963ad80d7a539351b3f1cb16e3040c2':
b/3344966 pan following the focus point instead the first point.
2011-01-12 15:30:14 -08:00
Jason Sams
ef56ee316c
Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
2011-01-12 15:28:19 -08:00
Huahui Wu
5587305109
Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
2011-01-12 15:27:16 -08:00
Jason Sams
ec30933c1d
WAR driver bug where surfaces of size 0 fail.
...
Change-Id: I72b356c4cfb71f2342479ca21238b763d02e729d
2011-01-12 15:26:25 -08:00
Jason Sams
07e27a11e4
am 208a1c68: Merge "Implement more of copy2DRange*" into honeycomb
...
* commit '208a1c68ee21930112a3704bf8c46a9f27d8d04d':
Implement more of copy2DRange*
2011-01-12 15:24:08 -08:00
Jason Sams
208a1c68ee
Merge "Implement more of copy2DRange*" into honeycomb
2011-01-12 15:22:09 -08:00
Romain Guy
c038ea358a
Reenable region composition pipeline for layers
...
Bug #3341848
It works this time!
Change-Id: I0d371d8b2c75c67d4ce5009ddb990fe5e55a0a27
2011-01-12 15:08:47 -08:00
Justin Ho
b1c9d782d0
am 63be8dd1: Merge "Updated notification sounds for trygon" into honeycomb
...
* commit '63be8dd178447fce289c940638cd37aa560d9de3':
Updated notification sounds for trygon
2011-01-12 15:08:24 -08:00
Romain Guy
b7a0fa5efb
am b08ea03c: Merge "Reenable region composition pipeline for layers Bug #3341848 " into honeycomb
...
* commit 'b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c':
Reenable region composition pipeline for layers Bug #3341848
2011-01-12 15:08:17 -08:00
Kenny Root
470750793b
am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
...
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
Add the {get,set}PackageObbPaths calls to API
2011-01-12 15:06:51 -08:00
Justin Ho
63be8dd178
Merge "Updated notification sounds for trygon" into honeycomb
2011-01-12 15:06:19 -08:00
Romain Guy
b08ea03c1b
Merge "Reenable region composition pipeline for layers Bug #3341848 " into honeycomb
2011-01-12 15:06:18 -08:00
Kenny Root
e8c04db71e
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
2011-01-12 15:03:43 -08:00
Xia Wang
3c5637a457
am 1aaae92f: Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb
...
* commit '1aaae92f990bad51d503fe692def01191fda4db7':
Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896
2011-01-12 15:03:41 -08:00
Jamie Gennis
f152f2efa6
am 103198a1: Merge "Implement crop & transform for SurfaceTexture." into honeycomb
...
* commit '103198a10cc22a49270a787d04b8ab484d2ec235':
Implement crop & transform for SurfaceTexture.
2011-01-12 15:03:37 -08:00
Carl Shapiro
90a1810219
am d688e5af: Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb
...
* commit 'd688e5af1c95a8b5a482c146cd789c2be45f9663':
Remove minimum heap size test now that the underlying interface is gone.
2011-01-12 15:03:34 -08:00
Marco Nelissen
18aa2da202
am a8a656b0: Fix scanning of modified files.
...
* commit 'a8a656b0c595fa876a387a91f8813f88a2d3abe7':
Fix scanning of modified files.
2011-01-12 15:03:28 -08:00
Kenny Root
c31e095e2b
am e7b2310a: Merge "Make sure AppCacheTest casts to long" into honeycomb
...
* commit 'e7b2310a856889aa1e683104039033ada3f6b696':
Make sure AppCacheTest casts to long
2011-01-12 15:03:24 -08:00
Brad Fitzpatrick
ef5864f1bb
am 2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
...
* commit '2e3908097b1c86004d50c0a070ca6b76a4d0d7c5':
Unhide Content{Resolver,Provider}.call()
2011-01-12 15:03:15 -08:00
Stephen Hines
564d360277
am a9b1b2a7: Merge "Unhide more of the RS APIs." into honeycomb
...
* commit 'a9b1b2a703b45632d6fb63271e0c00316faa5ec7':
Unhide more of the RS APIs.
2011-01-12 15:03:07 -08:00
Amith Yamasani
d2a922720f
Remove popup indicator for dialog style preference items.
...
Bug: 3341160
Change-Id: I1d3da0dfd7216f6bdea0c38347f57ec524a1641b
2011-01-12 15:01:05 -08:00
Xia Wang
1aaae92f99
Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb
2011-01-12 14:58:46 -08:00
Jamie Gennis
103198a10c
Merge "Implement crop & transform for SurfaceTexture." into honeycomb
2011-01-12 14:57:29 -08:00
Jason Sams
fb9f82ca4f
Implement more of copy2DRange*
...
Change-Id: Id6be481c4abc968df27e5bba1ed044262ec0f293
2011-01-12 14:53:25 -08:00
Carl Shapiro
d688e5af1c
Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb
2011-01-12 14:51:54 -08:00
Marco Nelissen
a8a656b0c5
Fix scanning of modified files.
...
When a media file, particularly a music file, is updated, the media
scanner should use the correct Uri to update it, and not the generic
files Uri. Otherwise, things like artist and album name will not
be properly updated.
Change-Id: I576629c51282bfbeb61c23f1e43b072700084a6c
2011-01-12 14:46:49 -08:00