Jason Sams
656ef8daca
Merge "Begin hooking up SurfaceConfig."
2010-10-13 15:33:00 -07:00
Romain Guy
488a9c36ee
Merge "Add a getNativeMatrix() API."
2010-10-13 14:18:18 -07:00
Irfan Sheriff
30a00e6a03
Merge "state machine fixes"
2010-10-13 13:55:39 -07:00
Amith Yamasani
45b26832c6
Merge "Add voice button and a bunch of minor fixes for focus and visibility of ime, submit button and drop down."
2010-10-13 13:19:28 -07:00
Joe Onorato
2441ca615b
am 0ad4a77c: (-s ours) am 1169f420: Merge "Add animation for the status bar going away." into gingerbread
...
Merge commit '0ad4a77cb78348951c349ba92ec858bfb26aeb33'
* commit '0ad4a77cb78348951c349ba92ec858bfb26aeb33':
Add animation for the status bar going away.
2010-10-13 12:13:28 -07:00
Irfan Sheriff
697127a696
Merge "Retry quicker for control channel setup"
2010-10-13 10:15:43 -07:00
Alex Sakhartchouk
9f73d8bbc6
Merge "Packing the struct to work around llvm bug."
2010-10-13 10:11:02 -07:00
Bjorn Bringert
1670393563
Merge "Make fields in WebAddress private, add getters/setters"
2010-10-13 08:31:48 -07:00
Ben Murdoch
40ca2cb9a5
Merge "Sync autofill profile data to native WebKit"
2010-10-13 04:47:21 -07:00
Steve Block
0670e7b4de
Merge "Implement DeviceMotionEvent"
2010-10-13 04:18:37 -07:00
Adam Powell
db472e3369
Merge "Holo fixes and refinements"
2010-10-12 18:49:08 -07:00
Romain Guy
48ea2ae901
Merge "Optimize layer clears."
2010-10-12 18:44:18 -07:00
Gil Dobjanschi
272f704c1f
Merge "Test implementation bug fix."
2010-10-12 18:34:03 -07:00
Winson Chung
876aeabf16
Merge "Extracting default loading view definition into XML resource."
2010-10-12 18:25:25 -07:00
Jeff Brown
afa0ccd368
Merge "resolved conflicts for merge of f2e0681a to master"
2010-10-12 18:20:26 -07:00
Romain Guy
b64b6f067c
Merge "Tweak layers caching for better performance in Launcher."
2010-10-12 18:20:06 -07:00
Jeff Brown
26dbf44c66
resolved conflicts for merge of f2e0681a to master
...
Change-Id: I5ba9b1f16a29f73444123bcead4c53f09a79b0f6
2010-10-12 18:19:08 -07:00
Joe Onorato
08d795291c
am d965724f: (-s ours) am 44104df1: Merge "Fix status bar flashing after orientation change" into gingerbread
...
Merge commit 'd965724fdcc63a070657518542559a8b1a35a70d'
* commit 'd965724fdcc63a070657518542559a8b1a35a70d':
Fix status bar flashing after orientation change
2010-10-12 18:05:09 -07:00
Romain Guy
4a77cb6bde
Merge "Remove logging."
2010-10-12 17:50:32 -07:00
Chris Tate
f819d7a2a9
Merge "Don't stomp on the drag-focus bookkeeping inadvertently."
2010-10-12 17:42:15 -07:00
Kenny Root
5fc97fe955
am 1c67b7af: am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread
...
Merge commit '1c67b7af0147080de807db3cc564899db85b43a8'
* commit '1c67b7af0147080de807db3cc564899db85b43a8':
Grant URI permissions to the MCS
2010-10-12 16:40:47 -07:00
Jean-Baptiste Queru
c64ef759ac
am cf88cf87: (-s ours) am 15f7ff3c: Merge "Fix compile errors in telephony tests"
...
Merge commit 'cf88cf878be96a564b38f428c161cc864dfad56d'
* commit 'cf88cf878be96a564b38f428c161cc864dfad56d':
Fix compile errors in telephony tests
2010-10-12 16:37:44 -07:00
Joe Onorato
8cbb1e7af4
am 14854820: am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
...
Merge commit '14854820eac895a925791fb41ccd330447fd4f02'
* commit '14854820eac895a925791fb41ccd330447fd4f02':
Add a configuration option to turn on the screen when you unplug the device.
2010-10-12 16:27:22 -07:00
Scott Main
3779d156ec
am ad9a559c: (-s ours) am 3d90d11a: am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
...
Merge commit 'ad9a559c611a2901a490c887f03d9622695beba2'
* commit 'ad9a559c611a2901a490c887f03d9622695beba2':
Revert "docs: new web apps dev guides" Do not merge.
2010-10-12 16:26:53 -07:00
Romain Guy
55ae1bce3a
Merge "Optimize 9patch rendering."
2010-10-12 16:01:41 -07:00
Alex Sakhartchouk
1ef52f9a2c
Merge "Fixing font bug, initialization was done in the wrong order."
2010-10-12 14:17:59 -07:00
Chris Tate
3e99865d79
Merge "Elide undelivered drag-location messages"
2010-10-12 14:05:14 -07:00
Chris Tate
45a22e5d6d
am a75803e9: am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread
...
Merge commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2'
* commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2':
Temporarily turn on backup/restore debug logs
2010-10-12 13:57:20 -07:00
Mathias Agopian
eb8f8980d4
am 5d477279: am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
...
Merge commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78'
* commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78':
fix a bug where FLIP_H would do a 180 rotation
2010-10-12 13:57:09 -07:00
Mathias Agopian
09e5687757
am 3754d0cc: am d0528b74: Merge "deliver invalidate messages AFTER other messages" into gingerbread
...
Merge commit '3754d0ccc7ba07fd867d3d28e6493e84ce0a139d'
* commit '3754d0ccc7ba07fd867d3d28e6493e84ce0a139d':
deliver invalidate messages AFTER other messages
2010-10-12 13:56:58 -07:00
Joe Onorato
a66d342f17
am 5be893a7: am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread
...
Merge commit '5be893a71aa72f54660496dd01cfad66adb86b8f'
* commit '5be893a71aa72f54660496dd01cfad66adb86b8f':
Don't throw when userActivity fails because of the permission check.
2010-10-12 13:22:41 -07:00
Brad Fitzpatrick
6e98906721
am 2af4c51e: am 6bb7a4a6: Go one day into 1970 for timezone code.
...
Merge commit '2af4c51e9a82848e3efce4621559a69fda965665'
* commit '2af4c51e9a82848e3efce4621559a69fda965665':
Go one day into 1970 for timezone code.
2010-10-12 13:22:27 -07:00
Romain Guy
7d3d01000a
Merge "Simplify black texture fragment shader."
2010-10-12 13:15:44 -07:00
Brad Fitzpatrick
987c90d7a1
resolved conflicts for merge of 14d151bf to master
...
Change-Id: Ib1ac9acfd6dc71b5fa4e1456a056d1e9dee65fda
2010-10-12 13:12:18 -07:00
Kenny Root
2eeec06971
Merge "Add API to check for emulated external storage"
2010-10-12 12:45:46 -07:00
Adam Powell
62b09b91d4
Merge "Holo fixes"
2010-10-12 12:02:11 -07:00
Romain Guy
360fac0ceb
Merge "Fix invisible views issue in Launcher."
2010-10-12 11:55:50 -07:00
Mathias Agopian
2669131aed
am 8b8a8f65: am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
...
Merge commit '8b8a8f65b5306aa557028feba7317470222a73df'
* commit '8b8a8f65b5306aa557028feba7317470222a73df':
fix a bug where timeouts would only be handled when a message was delivered
2010-10-12 11:51:13 -07:00
Andreas Huber
d1c53a1961
am 5b0d0630: am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
...
Merge commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5'
* commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
2010-10-12 11:51:01 -07:00
Mike Lockwood
3c7c64e9c4
am 431dd3b1: am 86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
...
Merge commit '431dd3b1bc8f2acf7cbcf08463649b5629baf398'
* commit '431dd3b1bc8f2acf7cbcf08463649b5629baf398':
GPS: Add update_network_state call to AGpsRillInterface
2010-10-12 11:50:23 -07:00
Brad Fitzpatrick
4c3ce7b575
am 3a4b7dfd: am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
...
Merge commit '3a4b7dfddab67c531dca23c6691063a829376d4f'
* commit '3a4b7dfddab67c531dca23c6691063a829376d4f':
StrictMode: check max-offenses-per-loop earlier, before allocations
2010-10-12 11:50:04 -07:00
Mike Lockwood
0fbfa9d1fb
Merge "MTP: allow renaming directories"
2010-10-12 11:42:33 -07:00
Xia Wang
3d74f80e33
Merge "resolved conflicts for merge of d4e3bf4d to master"
2010-10-12 11:07:11 -07:00
Xia Wang
00a0124123
resolved conflicts for merge of d4e3bf4d to master
...
Change-Id: I41c0ae2b3f557f84b25c39e247894f66a4e7e702
2010-10-12 11:05:54 -07:00
Romain Guy
3b996c96e4
Always create OpenGL accelerated windows in RGBA 8888.
...
Bug #3081600
The OpenGL renderer in libhwui uses a single EGL context per process and
thus create it with an RGBA 8888 EGL configuration. To ensure that all
windows are compatible with this configuration, this change modifies
the window manager and SurfaceFlinger.
The window manager now checks the window's flags and if the window is
hardware accelerated, it forces the window's pixel format to be
translucent when creating the surface. The window itself is still
marked as opaque if we know that the window will be opaque on screen.
This keeps existing optimizations in place.
Similarly in SurfaceFlinger, a translucent Surface can now be created
with the Surface.OPAQUE flag, indicating SurfaceFlinger that the surface
does not require blending, despite its RGBA 8888 configuration.
Change-Id: Ic747b6b12564ba064412d842117880fcc199eb7c
2010-10-12 11:00:18 -07:00
Bjorn Bringert
f5afdde5e7
Merge "Remove the unused UrlRendererService"
2010-10-12 10:57:15 -07:00
Romain Guy
beddf2bab0
Merge "Don't set hwAccelerated=true when libhwui is not present."
2010-10-12 10:36:35 -07:00
Mike Lockwood
2059fcb78a
Merge "MTP: Add support for renaming files"
2010-10-12 09:46:14 -07:00
Alex Sakhartchouk
f097f64236
Merge "Fixing refcounting debug statements that've gotten bitrotten."
2010-10-12 09:40:23 -07:00
Jean-Baptiste Queru
0ed3f5dead
resolved conflicts for merge of e69f1f1a to master
...
Change-Id: I32b34e4f6ae83ff40398c6e9e2881af12abc4aa8
2010-10-12 09:23:10 -07:00