54373 Commits

Author SHA1 Message Date
Adam Powell
9a845ee425 Merge "Update ActionProvider to support dynamically building submenus." 2011-07-12 15:08:37 -07:00
Kazuhiro Ondo
64bd196fe4 am a9e00a4a: am 89799e72: Fix incorrect ERI banner format
* commit 'a9e00a4ac806751d8af0d9386ee3ae9bd18492b4':
  Fix incorrect ERI banner format
2011-07-12 14:56:59 -07:00
Wink Saville
474c924379 Merge "resolved conflicts for merge of 99cd6671 to master" 2011-07-12 14:46:02 -07:00
Adam Powell
961dd11895 Update ActionProvider to support dynamically building submenus.
Stub out ShareActionProvider for building a submenu of activities to
choose from.

Change-Id: Ibd9ada77a455ed1a296c87b6d967073ca0f676c2
2011-07-12 14:43:41 -07:00
James Dong
03fb5f30aa Merge "Make MetadataBufferType.h C-friendly" 2011-07-12 14:43:34 -07:00
Svetoslav Ganov
5fa915039a Merge "Date/time pickers and calendar view not handling locale change." 2011-07-12 14:39:07 -07:00
Svetoslav Ganov
f5926962cc Date/time pickers and calendar view not handling locale change.
1. The data/time pickers and calendar view do not handle locale
   change properly since they use cached Calendar instances to
   limit the GC but fail to update them when the local changes.

Change-Id: I2a92d7f4e0f2798422843123e5aa483f8044bbed
2011-07-12 14:15:37 -07:00
Mathias Agopian
ad3f935ce9 Merge "fix typo in a comment" 2011-07-12 14:11:57 -07:00
Mathias Agopian
43dd61e08a fix typo in a comment
Change-Id: If913611a65e8b578021e9f9a9546f05e0ce6ef44
2011-07-12 14:11:07 -07:00
Wink Saville
8ff5a9d84e resolved conflicts for merge of 99cd6671 to master
Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79
2011-07-12 13:56:05 -07:00
Xavier Ducrohet
dadae54a88 Merge "LayoutLib: updated fake accessbility manager and ensure there's an InputMethodManager" 2011-07-12 13:39:33 -07:00
Xavier Ducrohet
96131eef38 LayoutLib: updated fake accessbility manager and ensure there's an InputMethodManager
We had replaced the accessibility Manager but it lacked some new API. Obvisouly
this is fragile and should be fixed, but this works for now.

After fixing this there was another issue with the lack of InputMethodManager.
To fix this I had to create an implementation of IInputMethodManager which
normally comes from a binder object.

I may want to do a similar trick with the accessibility manager later.

Change-Id: I28c6494e333f39072f348d0199124efac93256a5
2011-07-12 12:35:50 -07:00
Jeff Brown
8c55a9a57e Merge "Remove the simulator target from all makefiles. Bug: 5010576" 2011-07-12 12:15:07 -07:00
Romain Guy
067b873f7c Merge "Add test for bug #4970944" 2011-07-12 12:14:11 -07:00
Xavier Ducrohet
f31e0d85e7 Merge "LayoutLib: Delegate for Display and IWindowManager implementation." 2011-07-12 12:03:23 -07:00
Chet Haase
9893fd9771 Merge "Fix Animator cancel() behavior" 2011-07-12 11:58:58 -07:00
Chet Haase
7dfacdb1c8 Fix Animator cancel() behavior
Previously, calling cancel() on an Animator would cause onAnimationCancel
events to be sent to all listeners. This was confusing for listeners
that were keying off this event for performing other actions, when the original
animator wasn't truly canceled (because it wasn't even running, or had already
been canceled earlier). This change hinges listener notification on
the animator actually running; no events are sent otherwise.

Also added the first set of Animator tests to verify that this behavior
is correct.

Change-Id: I81ab56559b5c0343c8dc7880e1c8235f3020975b
2011-07-12 11:55:51 -07:00
Xavier Ducrohet
9702b5e02a Merge "new button graphics for layoutlib." 2011-07-12 11:50:07 -07:00
Xavier Ducrohet
0a49635b17 LayoutLib: Delegate for Display and IWindowManager implementation.
This allows ViewConfiguration to be properly implemented which is now
required for the rendering to happen.

Change-Id: I55629689fa8f5f874b43fcac2aa0789ce02d58f4
2011-07-12 11:49:22 -07:00
Dave Santoro
345a88572f Merge "Add data_set column for raw contacts and groups." 2011-07-12 11:39:09 -07:00
Adam Powell
ba3f6ac52a Merge "Fix bugs around restoring submenu state after activity teardown/restore" 2011-07-12 11:36:43 -07:00
Adam Powell
11ed1d6cae Fix bugs around restoring submenu state after activity teardown/restore
Change-Id: I6cb5b3cad39b141dff84b8e0ca62f8f0a76a03b1
2011-07-12 11:35:15 -07:00
Jeff Sharkey
1ea4cc6464 Merge "Return stats from inactive ifaces, packet counts." 2011-07-12 11:09:09 -07:00
Fabrice Di Meglio
eb982f3991 Merge "Fix scrolling bug causing centered cursor." 2011-07-12 09:39:18 -07:00
James Dong
dcf8934f4e Make MetadataBufferType.h C-friendly
Change-Id: I4388d8f6cf30f08858aec73aa971647feae4a5e3
2011-07-12 09:35:40 -07:00
Ben Murdoch
a698e6a6db Merge changes I829b5d24,I521c0989
* changes:
  Add missing auto-fill strings.
  Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
2011-07-12 08:51:23 -07:00
Ben Murdoch
06da76bd2d Add missing auto-fill strings.
These strings had a defintion native side, but no corresponding
definition java side which would lead to a crash. Strings taken from
chrome/app/generated_resources.grd - see
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/app/generated_resources.grd?r1=75912&r2=76117&pathrev=88489

Also note that credit_card_number_preview_format is no longer needed.

See also change Ib861245e26197938bb2c5cf0f99c1d797ab0fbf2

Change-Id: I829b5d24e6f9a04211ee91c3f670c8659c004cd9
2011-07-12 14:54:40 +01:00
Ben Murdoch
bfcc595307 Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
See diff from last update here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_resources.grd?r1=75368&r2=82248

Change-Id: I521c098932dfcfcb728ed2d96afd22b7926e88e9
2011-07-12 14:54:20 +01:00
Mark Brophy
622c03e6cf Merge "Expose app resume times to the ApplicationProvider." 2011-07-12 02:57:16 -07:00
satok
6df76aa9f1 Merge "Change IME picker dialog from Activity to Broadcast" 2011-07-11 22:12:59 -07:00
Jeff Brown
bd882b1c87 Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
2011-07-11 22:12:16 -07:00
Mathias Agopian
e230189444 Merge "fix a weird use of Vector::appendVector()" 2011-07-11 18:30:41 -07:00
Mathias Agopian
e92963c3f9 Merge "Fix typo in an assert's log" 2011-07-11 18:30:29 -07:00
Romain Guy
5fccb70de9 Add test for bug #4970944
Change-Id: I3e7287bc406ff497a49cf823cee53b1a943a74a9
2011-07-11 18:23:09 -07:00
Doug Felt
25b9f42737 Fix scrolling bug causing centered cursor.
Change-Id: I792a2c4d291e2ac5f0d1ed6e74f5e2ecb395c010
2011-07-11 17:48:50 -07:00
Dave Santoro
d7bdc18f87 Add data_set column for raw contacts and groups.
This provides a way for multiple sync adapters to exist for a single
account type.  Internally, for example, we can use these new columns
to support separate sync adapters (and sourced data) for Focus,
Emerald Sea, and Latitude.

Change-Id: I1b8dfd79e9fb2dfcee6ac6d4adb947093f5c2324
2011-07-11 17:24:45 -07:00
Jamie Gennis
2d6bb33800 Merge changes I002177a6,Ibaff52fe
* changes:
  Add the EGL_ANDROID_recordable spec.
  Add the spec for EGL_ANDROID_blob_cache.
2011-07-11 17:14:33 -07:00
Jamie Gennis
8f80f152e5 Add the EGL_ANDROID_recordable spec.
Change-Id: I002177a68fafd6bb941aa64445c85fd5ff56223a
2011-07-11 17:13:02 -07:00
Robert Greenwalt
0870e81467 Merge "Fix wifi tethering." 2011-07-11 16:47:25 -07:00
Guang Zhu
5a8eccbfb9 Merge "allow Uri as intent extra in am command" 2011-07-11 16:45:35 -07:00
satok
683e2383c8 Change IME picker dialog from Activity to Broadcast
Change-Id: I4822899f34a2951d2f2a1258d1adcc7d8fccbb12
2011-07-12 08:28:52 +09:00
Mathias Agopian
198fd888ad fix a weird use of Vector::appendVector()
operator= is way more efficient.

Change-Id: I61c9adb1413bed230801a77151b8f7000fd11471
2011-07-11 16:26:36 -07:00
Mathias Agopian
cf7e3a5984 Fix typo in an assert's log
Change-Id: I94883a23a0a92eaf3e4976f942f747a2137499ac
2011-07-11 16:26:18 -07:00
Jeff Brown
9f845cff9b Merge "Increase activity timeouts when using a wrapper process." 2011-07-11 16:00:11 -07:00
Jeff Brown
3f9dd287b9 Increase activity timeouts when using a wrapper process.
This patch enables the Zygote to tell the ActivityManager when
it has started a process with a wrapper attached so that the
ActivityManager can allow it extra time to start up or process
events.

This is useful when wrapping an app with Valgrind or other tools
which add significant runtime overhead.

Bug: 4584468
Change-Id: I5db6f2f15cd30b0ec40f547d2fadfa216de2926d
2011-07-11 15:57:15 -07:00
Mike Lockwood
801525cecc Merge "UsbDeviceManager: Include kernel USB state in dumpsys output" 2011-07-11 15:52:30 -07:00
Mike Lockwood
8f540d4d02 Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state" 2011-07-11 15:52:06 -07:00
Jason Sams
ac7f69bac3 Merge "Add error checks for AllocationAdapters being used in unsupported ways." 2011-07-11 15:47:36 -07:00
Jamie Gennis
308f9f6b24 Merge "EGL: fix the ANativeWindow size/fmt override" 2011-07-11 15:47:20 -07:00
Romain Guy
f21f07627d Merge "Always make GL calls with a valid EGL context. Bug #5010760" 2011-07-11 15:37:24 -07:00