33921 Commits

Author SHA1 Message Date
Jeff Brown
9f164aa9b3 am b05632aa: am a28d5aff: Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread
Merge commit 'b05632aae37ea3a3573aabf10e6868733546de96'

* commit 'b05632aae37ea3a3573aabf10e6868733546de96':
  Fix a bug synthesizing cancelation events for motions.
2010-10-13 17:01:53 -07:00
Hung-ying Tyan
8635bb5405 am c74d3917: am ece7e11b: Merge "SipService: fix a missing switch-case break." into gingerbread
Merge commit 'c74d39173e1071dbffe713e008b95784ac4312bc'

* commit 'c74d39173e1071dbffe713e008b95784ac4312bc':
  SipService: fix a missing switch-case break.
2010-10-13 17:01:38 -07:00
Dianne Hackborn
bc931eaf15 am a007ab29: am ffbc4b94: Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread
Merge commit 'a007ab294d83db987b05b49ab869566978a87494'

* commit 'a007ab294d83db987b05b49ab869566978a87494':
  Fix SD card mounting issues #3074555 and #3072332
2010-10-13 17:01:17 -07:00
Daniel Sandler
db6303e51e Merge "Dynamically show the menu button on the system bar." 2010-10-13 16:32:07 -07:00
Erik
70983c47a9 Merge "Adds a way to scroll to a position in a given duration" 2010-10-13 16:03:21 -07:00
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
Erik
322171b333 Adds a way to scroll to a position in a given duration
Adds a method to AbsListView to allow for a smooth scroll to an
offset position with an app defined duration.

Change-Id: I8cd690597cda078b25bce9aeba683be030d6b155
2010-10-13 15:53:40 -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
Alex Sakhartchouk
9e401bcd88 Changing scenegraph sample to use arrays.
Change-Id: Ifa454d503c1445efcad6e31243b65d75e62e3035
2010-10-13 14:33:44 -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
Daniel Sandler
e02d808abf Dynamically show the menu button on the system bar.
Windows with FLAG_NEEDS_MENU_KEY (or windowNeedsMenuKey=true
in their theme) will cause the system bar to show a menu
icon. (Note that the phone's status bar currently ignores
this, but phones tend to have hardware menu keys anyway.)

Additionally, all windows whose package's SDK version is
pre-Honeycomb will have FLAG_NEEDS_MENU_KEY set by default.

Bug: 3003728

Change-Id: I2d983763a726ea4f32cd1af9b0390e30478b11d1
2010-10-13 16:25:43 -04: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
James Dong
0349b27be5 Remove hard-coded color format for Nvidia's video encoder
o camera would query the color format if camera source is used
o if camera source is not used, a MetaData can be passed to do the same.

Change-Id: Iff1f802cc4974b286085473e5384bd88e04fa05d
2010-10-13 12:34:47 -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
Jaikumar Ganesh
79a5307ac2 am 1bc3a407: Merge "Fix auto connection priority handling." into gingerbread
Merge commit '1bc3a407ceb380e35e894f405f544b5b87e980d4' into gingerbread-plus-aosp

* commit '1bc3a407ceb380e35e894f405f544b5b87e980d4':
  Fix auto connection priority handling.
2010-10-12 16:50:45 -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
Jaikumar Ganesh
1bc3a407ce Merge "Fix auto connection priority handling." into gingerbread 2010-10-12 16:46:50 -07:00
Jaikumar Ganesh
bcf5cf47ed Fix auto connection priority handling.
Bug: 3027023
1. user is connected to a headset. Headset is turned off.
2. User connects to another device. The priority of the first
   headset must be set to ON. We only have 1 device set at AUTO_CONNECT
   priority.

1. A remote headset sends an incoming connection. Don't set
   AUTO_CONNECT till its gets connected.
2. For outgoing connections, set it to AUTO_CONNECT in Connecting state
   since the user initated this connection.

Change-Id: Iaa211bf22b1fd99850875f7eda686c47142173ba
2010-10-12 16:42:45 -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