Commit Graph

26991 Commits

Author SHA1 Message Date
Mathias Agopian
cc866edc32 Merge "Fix the ISurfaceComposer onTransact switch." 2011-01-16 17:31:42 -08:00
Robert Greenwalt
946d54fabf Merge "Moving gsm.NetworkInfo to OperatorInfo" 2011-01-16 15:53:37 -08:00
Shih-wei Liao
8542f033d3 am 0340f995: am 71a2e13d: On-device linking using bccLinkBC. Note that we switch to getFile interface on the libbcc side.
* commit '0340f9955f99644682c07351cbacdcd7fc06e88a':
  On-device linking using bccLinkBC. Note that we switch to getFile interface on the libbcc side.
2011-01-16 10:46:29 -08:00
Adam Powell
e48a855dc7 am 9b90ac3b: am efb9000f: Fix bug 3355197 - TextView error popup text color
* commit '9b90ac3b06a5536df9a5beb4a0d36b708df385f3':
  Fix bug 3355197 - TextView error popup text color
2011-01-16 10:46:00 -08:00
Adam Powell
2d6ee7e291 am 9f5f3d92: am c6ac2472: Merge "Fix bug 3238726 - AutoCompleteTextView dropdown text color" into honeycomb
* commit '9f5f3d92cebc860ae57869e5299c3494f93a6ca5':
  Fix bug 3238726 - AutoCompleteTextView dropdown text color
2011-01-16 10:45:52 -08:00
Adam Powell
5f051d3de4 am 39ec9427: am b921072c: Fix bug 3356144 - Alert dialog in Holo Dark theme has wrong height
* commit '39ec9427fb64481596a1764b3470f5996adb8626':
  Fix bug 3356144 - Alert dialog in Holo Dark theme has wrong height
2011-01-16 10:45:45 -08:00
Adam Powell
ede10988a6 am ebef3b8c: am 115ad165: Merge "Fix bug 3355197 - Add attribute for fast scroll preview panel text color." into honeycomb
* commit 'ebef3b8ca510ae26a04236bfbee1f96f0bda286d':
  Fix bug 3355197 - Add attribute for fast scroll preview panel text color.
2011-01-16 10:45:31 -08:00
Jamie Gennis
bdd4f64323 am 0969120b: am 39de4584: Merge "Compare GraphicBuffers using handles." into honeycomb
* commit '0969120b61cea2b6337c4f02462dfdef3ce393f6':
  Compare GraphicBuffers using handles.
2011-01-16 10:45:27 -08:00
Joe Onorato
fabb01c21a am 46f98a78: am 80a44401: Need to update the largeIcon for notifications when we\'re reapplying the views.
* commit '46f98a78e2884ea91c5cd46d1d95347662e3d2e7':
  Need to update the largeIcon for notifications when we're reapplying the views.
2011-01-16 10:45:12 -08:00
Wink Saville
624cdd2529 am eb731123: am a47aa87a: Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb
* commit 'eb7311231203b7943027fd9992a5a59f67799615':
  Set mIsMinInfoReady and mCurrentOtasp before notifcations.
2011-01-16 10:44:28 -08:00
Nick Pelly
87a0de7307 am 18f52d53: am f780350e: am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread
* commit '18f52d533d735c4221d0da7c73583cfee377587d':
  Make sure service handles are live before passing to other objects.
2011-01-16 10:44:06 -08:00
Jean-Baptiste Queru
45f90971fa am 89a11e5d: (-s ours) am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge
* commit '89a11e5d5c3210359679e6f211444e0d7240ae0a':
  Squash commits of the following patches, cherry-picked from other branch - do not merge.
2011-01-16 10:44:01 -08:00
Jaikumar Ganesh
0a15a4d5e3 am e76ca5e0: (-s ours) am ef6abd8a: (-s ours) am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
* commit 'e76ca5e0f1cd7b5417ed5bc05ef4cbe968e8197e':
  Do Not Merge: Expose insecure rfcomm Bluetooth API.
2011-01-16 10:43:56 -08:00
Dianne Hackborn
4ad1d27222 am 89f0e6fe: am dd4a1e38: am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"
* commit '89f0e6fe38a6388b044fca627287ceeeaa8bf88d':
  Don't drop the drawable cache completely on configuration change
2011-01-16 10:43:49 -08:00
Dianne Hackborn
e747f154ba am ff59234a: am 1e6f5f04: am c3d0d860: Merge "Make the Phone options dialog use current language"
* commit 'ff59234a4116fe871cc94c678240a54243d7fa37':
  Make the Phone options dialog use current language
2011-01-16 10:43:44 -08:00
Dianne Hackborn
a8de4eb6f0 am ba3aa224: am e1d12668: am 0950a3ef: Merge "Added check to make orientation calculations more robust"
* commit 'ba3aa22429a3f8b09c501b9adec4accf56c2337f':
  Added check to make orientation calculations more robust
2011-01-16 10:43:38 -08:00
Dianne Hackborn
f7f7c5bede am b69c4e36: am 544ff558: am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread
* commit 'b69c4e36bec6bfd66e9d67ee3a5befab98ff9e64':
  Added check to make orientation calculations more robust
2011-01-16 10:43:32 -08:00
Dianne Hackborn
ff24bd897f am 21b0fb95: am ff3a2c18: am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread
* commit '21b0fb951b0aaa6a07a4aaed4a4733ca659d93db':
  Make the Phone options dialog use current language
2011-01-16 10:43:25 -08:00
Romain Guy
408aa14088 am 32221306: am 2e7fbd97: Merge "Preapre region tracking in layers" into honeycomb
* commit '32221306848988e6857ae0f76a3f17c866d62561':
  Preapre region tracking in layers
2011-01-16 10:42:54 -08:00
Mathias Agopian
a3243b1c85 am 0f508731: am fd7a411a: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb
* commit '0f508731221c9997811fda189254a4bb1e3821bd':
  partially fix [3306150] HTML5 video with H/W acceleration blackout
2011-01-16 10:42:46 -08:00
Mathias Agopian
b13547f5fb am ceaf8ac3: am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb
* commit 'ceaf8ac31c0ee131f5c7865feb227f60def729df':
  Fix error reporting in Surface::cancelBuffer()
2011-01-16 10:42:39 -08:00
James Dong
6c3c8a0470 am b3f44773: am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb
* commit 'b3f44773897588cf1ab6335444e4ca5fb0160a7f':
  Fixed thrashing in the cached buffer during 720p YT video streaming
2011-01-16 10:42:32 -08:00
Jeff Brown
ca0280dff4 am c299302e: am 7a1c32e7: Merge "Add support for detecting finger orientation." into honeycomb
* commit 'c299302e986646c74ce878502cc72ff33c9849c0':
  Add support for detecting finger orientation.
2011-01-16 10:42:25 -08:00
Justin Ho
043bebe1e7 am a6724ae1: am 0a26f3ce: Merge "New tray notification icons, new system bar icons" into honeycomb
* commit 'a6724ae1de4db7f57d8b0558d6d7d7c0307318af':
  New tray notification icons, new system bar icons
2011-01-16 10:42:11 -08:00
Romain Guy
07447ccc6d am cfde8514: am 739e34a3: Merge "Don\'t crash Launcher on config change." into honeycomb
* commit 'cfde851492e4ea5c2382dedf4dcc697a2818784b':
  Don't crash Launcher on config change.
2011-01-16 10:42:01 -08:00
Adam Powell
94fa89e20f am 7128722b: am 1362c94b: Merge "Fix bug 3337711 - Volume panel layout adjustments" into honeycomb
* commit '7128722bce15bb0de89829676f7722ce39f1eb84':
  Fix bug 3337711 - Volume panel layout adjustments
2011-01-16 10:41:53 -08:00
Jeff Brown
0c5505694c am 2440c437: am 77c3e4b9: Merge "Make getFallbackAction return false when there is none." into honeycomb
* commit '2440c437698eee54f6595a88c66a779fcce50e5c':
  Make getFallbackAction return false when there is none.
2011-01-16 10:41:34 -08:00
Jeff Brown
7b0c4ed00d am 9f1ae205: am 06bc9721: Merge "Disable soft keyboard when keyboard attached." into honeycomb
* commit '9f1ae205b40a2cc730b3e07b1a408ad2803c40fd':
  Disable soft keyboard when keyboard attached.
2011-01-16 10:41:22 -08:00
Jeff Brown
af20a7cde0 am 195f13b8: am 1061b966: Merge "Fix bug with mice that send multiple BTN_MOUSE values." into honeycomb
* commit '195f13b803e26375d58d03dd61099f586d86ea8c':
  Fix bug with mice that send multiple BTN_MOUSE values.
2011-01-16 10:41:03 -08:00
Xavier Ducrohet
110cfb0833 am c9770b36: am 72fcd0a4: Merge "LayoutLib: update logs to use new data bundle" into honeycomb
* commit 'c9770b36144827e6a68ac12d1a61816f2dcdb236':
  LayoutLib: update logs to use new data bundle
2011-01-16 10:40:48 -08:00
Romain Guy
9bedaa134a am 2be00ccb: am 8dd5b1e5: Prevent NPE when a View is detached without having been attached. Bug #3355252
* commit '2be00ccbe7c8e2aedfa15b6b7c469160734dda15':
  Prevent NPE when a View is detached without having been attached. Bug #3355252
2011-01-16 10:40:38 -08:00
Jeff Brown
fe4d5cd653 am 12116af5: am c8276990: Merge "Add volume down as a safe mode key for Stingray." into honeycomb
* commit '12116af5c422608d609ec884939ee8ceba3279b9':
  Add volume down as a safe mode key for Stingray.
2011-01-16 10:40:20 -08:00
Shih-wei Liao
e377641021 am 71a2e13d: On-device linking using bccLinkBC. Note that we switch to getFile interface on the libbcc side.
* commit '71a2e13d19fa8d8f88b6b97e2b28296094af3005':
  On-device linking using bccLinkBC. Note that we switch to getFile interface on the libbcc side.
2011-01-16 04:00:57 -08:00
Adam Powell
7eff921f3f am efb9000f: Fix bug 3355197 - TextView error popup text color
* commit 'efb9000f42f30cc6e70113626de0f05456340ad2':
  Fix bug 3355197 - TextView error popup text color
2011-01-15 20:52:32 -08:00
Adam Powell
944c1b04f9 am c6ac2472: Merge "Fix bug 3238726 - AutoCompleteTextView dropdown text color" into honeycomb
* commit 'c6ac2472c9a24675795df19d2c07cfa86d931dc4':
  Fix bug 3238726 - AutoCompleteTextView dropdown text color
2011-01-15 20:07:52 -08:00
Adam Powell
d8077feeee Merge "Fix bug 3238726 - AutoCompleteTextView dropdown text color" into honeycomb 2011-01-15 20:05:21 -08:00
Adam Powell
fc03504838 am b921072c: Fix bug 3356144 - Alert dialog in Holo Dark theme has wrong height
* commit 'b921072c2b509cf31d9d9779b30c278bc6f9f640':
  Fix bug 3356144 - Alert dialog in Holo Dark theme has wrong height
2011-01-15 19:29:30 -08:00
Adam Powell
e6672786ce am 115ad165: Merge "Fix bug 3355197 - Add attribute for fast scroll preview panel text color." into honeycomb
* commit '115ad16551c9cf9551f44cbea59f3edf83e4a340':
  Fix bug 3355197 - Add attribute for fast scroll preview panel text color.
2011-01-15 17:25:49 -08:00
Adam Powell
6b5fa98576 Merge "Fix bug 3355197 - Add attribute for fast scroll preview panel text color." into honeycomb 2011-01-15 17:23:39 -08:00
Jamie Gennis
1cec8c0c15 am 39de4584: Merge "Compare GraphicBuffers using handles." into honeycomb
* commit '39de45846cd9431e9fc1ee44591152bc566f9858':
  Compare GraphicBuffers using handles.
2011-01-15 17:03:28 -08:00
Jamie Gennis
361dcc75b1 Merge "Compare GraphicBuffers using handles." into honeycomb 2011-01-15 17:01:51 -08:00
Jamie Gennis
73e8b9e524 Compare GraphicBuffers using handles.
This change fixes a bug in SurfaceTextureClient where GraphicBuffers
were being compared using pointer comparison rather than handles.

Change-Id: Ib8989af94be32d4efd86e020a732f5143088a863
2011-01-15 17:00:06 -08:00
Joe Onorato
bb0039c598 am 80a44401: Need to update the largeIcon for notifications when we\'re reapplying the views.
* commit '80a44401a22344f7eabce6976372ab144ef22893':
  Need to update the largeIcon for notifications when we're reapplying the views.
2011-01-15 16:25:46 -08:00
Wink Saville
67a5c2aa21 am a47aa87a: Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb
* commit 'a47aa87a19c733e28d9d2db1c4eb7f29d668db7b':
  Set mIsMinInfoReady and mCurrentOtasp before notifcations.
2011-01-15 10:13:07 -08:00
Wink Saville
bcb3e57eef Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb 2011-01-15 10:11:08 -08:00
Nick Pelly
2fd77c349a am f780350e: am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread
* commit 'f780350edb403739fee1a99b0ca91541f5ec0b91':
  Make sure service handles are live before passing to other objects.
2011-01-14 21:30:20 -08:00
Jean-Baptiste Queru
8e3c15e8d7 am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge
* commit '9286cfe5017363d95798d85163ec4f28aeb0c675':
  Squash commits of the following patches, cherry-picked from other branch - do not merge.
2011-01-14 21:30:16 -08:00
Jaikumar Ganesh
bf403ce6bd am ef6abd8a: (-s ours) am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
* commit 'ef6abd8a3e4b05cb9d94f29f4e8ffc7bb2ecec77':
  Do Not Merge: Expose insecure rfcomm Bluetooth API.
2011-01-14 21:30:06 -08:00
Dianne Hackborn
abd95f3ca7 am dd4a1e38: am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"
* commit 'dd4a1e3825f4f379ba36fd721f78de0101bb1833':
  Don't drop the drawable cache completely on configuration change
2011-01-14 21:29:59 -08:00
Dianne Hackborn
3ff09c8d9d am 1e6f5f04: am c3d0d860: Merge "Make the Phone options dialog use current language"
* commit '1e6f5f0453a2be0553de39c3b6f97da7c66b0b3b':
  Make the Phone options dialog use current language
2011-01-14 21:29:48 -08:00