23403 Commits

Author SHA1 Message Date
Romain Guy
6ce9ed955e Merge "Revert "Don't preload HardwareRenderer, its static initialization is process dependant."" 2011-07-12 19:10:22 -07:00
Romain Guy
08645eb0f4 Revert "Don't preload HardwareRenderer, its static initialization is process dependant."
This reverts commit 821e24336b3ab1f902fc3ee8da423226f50b540c.
2011-07-12 19:09:03 -07:00
Fabrice Di Meglio
a6c53c7939 Merge "Introduce TextView drawableStart and drawableEnd" 2011-07-12 18:24:27 -07:00
Romain Guy
c93ffea268 Merge "Don't preload HardwareRenderer, its static initialization is process dependant." 2011-07-12 18:18:11 -07:00
Romain Guy
821e24336b Don't preload HardwareRenderer, its static initialization is process dependant.
Change-Id: I229357aaaa10b19209983c122f98dd3c07e01d7f
2011-07-12 18:16:35 -07:00
Elliott Hughes
0d5f971245 Merge "Fix typo in AndroidHttpClient JavaDoc." 2011-07-12 16:58:18 -07:00
Gilles Debunne
5292a9d0a0 Merge "Refactored TextView selectable state methods." 2011-07-12 16:38:51 -07:00
Elliott Hughes
7b91b31e28 Fix typo in AndroidHttpClient JavaDoc.
Bug: http://code.google.com/p/android/issues/detail?id=14788
Change-Id: I7465c6c42e7b208efc9c954ac46c1b683676106e
2011-07-12 16:02:50 -07:00
Jaikumar Ganesh
30e8f98277 Merge "Add REGISTERED_BEFORE_BOOT flag to intent." 2011-07-12 15:54:50 -07:00
Jeff Sharkey
f0c3b1b6b7 Merge "Hide NetworkStatsHistory internals." 2011-07-12 15:19:31 -07:00
Adam Powell
9a845ee425 Merge "Update ActionProvider to support dynamically building submenus." 2011-07-12 15:08:37 -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
Svetoslav Ganov
5fa915039a Merge "Date/time pickers and calendar view not handling locale change." 2011-07-12 14:39:07 -07:00
Jaikumar Ganesh
60b4d2a2bd Add REGISTERED_BEFORE_BOOT flag to intent.
Add the flag to Connection state changed intent because
external devices can get connected before booting is complete.

Change-Id: I5bed7a4aa75a42d6facc16aac4f2734e4b5fe246
2011-07-12 14:35:55 -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
Fabrice Di Meglio
a3b6b95f99 Introduce TextView drawableStart and drawableEnd
- update also unit tests

Change-Id: I20b82f5fea2cc48c93fd9e26eb03290ad730c08a
2011-07-12 14:04:24 -07:00
Jeff Sharkey
d37948f6ed Hide NetworkStatsHistory internals.
Instead of exposing internal storage details, offer getValues()
accessor which populates values into a recycled structure.

Change-Id: I5228d7099a8f61b2018a435a813435a67dae49b4
2011-07-12 13:57:06 -07:00
Wink Saville
8ff5a9d84e resolved conflicts for merge of 99cd6671 to master
Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79
2011-07-12 13:56:05 -07:00
Gilles Debunne
bb588da7b1 Refactored TextView selectable state methods.
There were inconsistencies across methods on how to decide if text is selectable.

Fleshed up textCanBeSelected to support all cases (including non editable textIsSelectable).

onTouchEvent removed from CursorController, test in SelectionModifierCursorController for
editable text is not needed since it is conditionned by an hasSelectionController().

Bug 5016955: protection in offset for text selection

Change-Id: I1e39f7c4a859476e0220e72a4e490b43e60b4a9a
2011-07-12 12:27:01 -07:00
Jeff Brown
8c55a9a57e Merge "Remove the simulator target from all makefiles. Bug: 5010576" 2011-07-12 12:15:07 -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
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
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
Jeff Brown
bd882b1c87 Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
2011-07-11 22:12:16 -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
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
Romain Guy
f21f07627d Merge "Always make GL calls with a valid EGL context. Bug #5010760" 2011-07-11 15:37:24 -07:00
Romain Guy
039857520b Always make GL calls with a valid EGL context.
Bug #5010760

Change-Id: If7500ef69683948e727df1406f458f18b11259d1
2011-07-11 15:33:51 -07:00
Daniel Lehmann
96fc8269ed Merge "Remove restricted white-listing" 2011-07-11 15:10:04 -07:00
Shimeng (Simon) Wang
645511b68d Merge "Set mActualScale when initialScale is set." 2011-07-11 14:40:04 -07:00
Jeff Sharkey
fd8be3e5e7 Return stats from inactive ifaces, packet counts.
When an iface goes inactive, xt_qtaguid maintains historical counters
instead of discarding.  Now reading and returning those values in
NetworkManagementService summary calls.  Tests to verify stats are
returned.

Modify NetworkStats to include rxPackets and txPackets values, and
move to Entry to eventually hide internal storage details.

Bug: 4984539
Change-Id: I1ba0bb5580c62e946d9dff2cc2a6f64aff403efc
2011-07-11 14:39:56 -07:00
Jaikumar Ganesh
5623b07497 Merge "Bluetooth Health APIs" 2011-07-11 14:17:57 -07:00
Shimeng (Simon) Wang
07ac175452 Set mActualScale when initialScale is set.
This sets mActualScale to be correct value if initialScale is set.

issue: 4982074
Change-Id: I69d12d185710e89fc91a3a6bdf566c7092f059b7
2011-07-11 14:13:17 -07:00
Adam Powell
3282703f12 Merge "New assets from UX for dialogs/menu frames" 2011-07-11 13:39:45 -07:00
Jeff Brown
501c4671e7 Merge "Eliminate single-process mode. Bug: 5010576" 2011-07-11 13:37:53 -07:00
Adam Powell
6f76635ee0 New assets from UX for dialogs/menu frames
Change-Id: If23f37f1aadb90af175664bdd2ddc485559e6781
2011-07-11 12:06:05 -07:00
Jaikumar Ganesh
fb658c72a3 Bluetooth Health APIs
1. Remove the check of configs in BluetoothHealth.
   This check is useless since BluetoothHealth is a proxy.

2. Add a wrapper and a callback class. We shouldn't expose
   Binder interfaces as public APIs.

Change-Id: If62620b4251cf93f3f97d2fe63099e40fae7da4d
2011-07-11 11:32:27 -07:00
Elliott Hughes
d44e1b6033 Merge "SDK_INT is not "current" on unreleased builds." 2011-07-11 11:24:54 -07:00
Andy McFadden
503f5301cd Merge "Relocate common Calendar classes" 2011-07-11 11:24:23 -07:00