Kenny Root
fd14fb5958
am c3041432: am de846ac6: Merge "Change to new binder implementation for OBB" into gingerbread
...
Merge commit 'c30414329c381afba7bd23bdd0f1237fad0850a6'
* commit 'c30414329c381afba7bd23bdd0f1237fad0850a6':
Change to new binder implementation for OBB
2010-10-13 15:58:59 -07:00
Kenny Root
0a9b54e88b
resolved conflicts for merge of 8bb7a1df to master
...
Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9
2010-10-13 15:43:51 -07:00
Jason Sams
0726fd9e83
Merge "Begin hooking up SurfaceConfig."
2010-10-13 15:33:00 -07:00
Jason Sams
11c8af9ded
Begin hooking up SurfaceConfig.
...
Change-Id: I328138f29affbed11fcfb5e9ed0872d4ba22d241
2010-10-13 15:31:10 -07:00
Adam Powell
d8404b2373
Allow icon+text action buttons
...
Change-Id: I96d1f3958de3ac13cadbab108b87d6bae96e9473
2010-10-13 14:35:19 -07:00
Romain Guy
79c9254087
Merge "Add a getNativeMatrix() API."
2010-10-13 14:18:18 -07:00
Irfan Sheriff
a338ca8339
Merge "state machine fixes"
2010-10-13 13:55:39 -07:00
Romain Guy
41030da168
Add a getNativeMatrix() API.
...
This API can be used by WebView to apply the appropriate transform
on its rendering.
Change-Id: I79aa39a29805f462fb08226370328815e74bdc52
2010-10-13 13:40:37 -07:00
Amith Yamasani
3f703de0fb
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
3c0365518f
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
Amith Yamasani
ebcf5a3a50
Add voice button and a bunch of minor fixes for focus and visibility of ime, submit button and drop down.
...
Bug: 3077768 suggestion drawer not dismissed
Bug: 3067611 submit button incorrectly displayed in some cases
2010-10-13 11:52:51 -07:00
Nicolas Roard
67a9f2ab97
GL Rendering
...
This is a two-parts CL, Its counterpart is https://android-git.corp.google.com/g/#change,71690
Change-Id: I8ebe7f3bce84e76c903908768d010f46f3a30a4c
2010-10-13 11:49:10 -07:00
Irfan Sheriff
1b0133a41c
Merge "Retry quicker for control channel setup"
2010-10-13 10:15:43 -07:00
Alex Sakhartchouk
d6edfbbb78
Merge "Packing the struct to work around llvm bug."
2010-10-13 10:11:02 -07:00
Alex Sakhartchouk
c119493e01
Packing the struct to work around llvm bug.
...
Change-Id: If94d6659df7e00b70c39619b05732046233cb196
2010-10-13 10:02:28 -07:00
Bjorn Bringert
2b67ce7213
Merge "Make fields in WebAddress private, add getters/setters"
2010-10-13 08:31:48 -07:00
Bjorn Bringert
eb8be973c7
Make fields in WebAddress private, add getters/setters
...
Change-Id: Iceaf3d648289344e53c37273f7324a79676fbef7
2010-10-13 16:21:01 +01:00
Ben Murdoch
ff4031bcb5
Merge "Sync autofill profile data to native WebKit"
2010-10-13 04:47:21 -07:00
Steve Block
7db7c5d60c
Merge "Implement DeviceMotionEvent"
2010-10-13 04:18:37 -07:00
Gilles Debunne
78996c9376
Changed Cut/Copy/Paste assets.
...
New assets, in dark/light version.
Made public attributes of the Theme, so that they can be customized.
Select_all was not included in that change. It is supposed to be represented
as text instead of an icon. Waiting for a CL that enables this feature.
Change-Id: Icc912b2eb582295c60c0a409760d2c3d65989fc6
2010-10-12 18:58:46 -07:00
Adam Powell
4388ecbf94
Merge "Holo fixes and refinements"
2010-10-12 18:49:08 -07:00
Adam Powell
ccb013ffac
Holo fixes and refinements
...
* Fix Holo.Light dialog text color for system-created dialogs
* Use the correct text anchor assets for selection mode
* Temp fix for small holo light button metrics
Change-Id: I974528418b69354961ea43abf8249c8caada8e17
2010-10-12 18:45:38 -07:00
Romain Guy
63eadbce77
Merge "Optimize layer clears."
2010-10-12 18:44:18 -07:00
Romain Guy
eb07af6873
Optimize layer clears.
...
Don't clear the entire texture when we use textures that are bigger
than the layer itself. This will save time during the glClear() calls.
Change-Id: I06f3259ba62affb3708ba69ea41418832c7e1a65
2010-10-12 18:40:36 -07:00
Gil Dobjanschi
2fd0c94a11
Merge "Test implementation bug fix."
2010-10-12 18:34:03 -07:00
Winson Chung
a0a312225a
Merge "Extracting default loading view definition into XML resource."
2010-10-12 18:25:25 -07:00
Jeff Brown
1b48063317
Merge "resolved conflicts for merge of f2e0681a to master"
2010-10-12 18:20:26 -07:00
Romain Guy
8cbda423d0
Merge "Tweak layers caching for better performance in Launcher."
2010-10-12 18:20:06 -07:00
Jeff Brown
c2ea2ec85e
resolved conflicts for merge of f2e0681a to master
...
Change-Id: I5ba9b1f16a29f73444123bcead4c53f09a79b0f6
2010-10-12 18:19:08 -07:00
Romain Guy
e91080581f
Tweak layers caching for better performance in Launcher.
...
Change-Id: Ia6e67699d98f69c8a93385b3ecbdd814c7b16921
2010-10-12 18:15:42 -07:00
Joe Onorato
e165de7685
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
290dcfb4e6
Merge "Remove logging."
2010-10-12 17:50:32 -07:00
Romain Guy
1f114a55b5
Remove logging.
...
Change-Id: Ibcb11d704653d8875e22629ea39e4ee2ebce3c22
2010-10-12 17:47:34 -07:00
Chris Tate
06cbb47bca
Merge "Don't stomp on the drag-focus bookkeeping inadvertently."
2010-10-12 17:42:15 -07:00
Chris Tate
048691cfac
Don't stomp on the drag-focus bookkeeping inadvertently.
...
Also don't update the focus tracking redundantly.
Fixes bug 3076468
Change-Id: I021e1bb91134d5226735d9510ad7f9a7b650f93f
2010-10-12 17:39:18 -07:00
Irfan Sheriff
68825ac32d
state machine fixes
...
- When supplicant dies, restart it
- When wifimonitor fails to connect in time, restart
supplicant
- fix dhcp counter reset
- defer all load/unload actions when waiting for supplicant
control connection
- we dont need to disconnect & reconnect at start with the
faster monitor connection and handling of failures
Bug: 2973023
Bug: 3090725
Change-Id: I5c834ddd08e6300e2b29da0941a24633825b4d3b
2010-10-12 16:47:51 -07:00
Kenny Root
ab275bb637
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
77b9c89f83
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
c88a1f955c
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
5e850b70dc
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
84349e3ef7
Merge "Optimize 9patch rendering."
2010-10-12 16:01:41 -07:00
Romain Guy
4bb942083a
Optimize 9patch rendering.
...
This change detects empty quads in 9patches and removes them from
the mesh to avoid unnecessary blending.
Change-Id: I4500566fb4cb6845d64dcb59b522c0be7a0ec704
2010-10-12 15:59:26 -07:00
Gil Dobjanschi
e2c28468a5
Test implementation bug fix.
...
Change-Id: I1448d06662e2538f01d9c462d4a86fcbf57d7125
2010-10-12 15:55:14 -07:00
Chris Tate
b8203e9718
Pass the starting touch point in the DRAG_STARTED message
...
Fixes bug 3089251
Change-Id: I072742dc6c5745083cdac8dcfa19fb1f2bbbf404
2010-10-12 14:23:21 -07:00
Alex Sakhartchouk
2bc063fdb6
Merge "Fixing font bug, initialization was done in the wrong order."
2010-10-12 14:17:59 -07:00
Alex Sakhartchouk
960ae15cf3
Fixing font bug, initialization was done in the wrong order.
...
Change-Id: Icc7b932f25be1ca6e5423bba6a5cfc965f6c3341
2010-10-12 14:15:17 -07:00
Chris Tate
5a3b8e698e
Merge "Elide undelivered drag-location messages"
2010-10-12 14:05:14 -07:00
Chris Tate
1ab5de7f21
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
ef31d7d00e
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
4fc01e9aae
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