51576 Commits

Author SHA1 Message Date
Jeff Brown
b530abcff5 am 3f5b95b0: am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
* commit '3f5b95b05efcf7ab2e8f193649b841dc1786f2ef':
  Touch pad UX improvements.
2011-05-31 16:03:07 -07:00
Jeff Brown
e129509422 am fd86ab8a: (-s ours) am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
* commit 'fd86ab8a0f15bb15a8c274b8ea61743216f39532':
  Fix deadlock in dispatcher. (DO NOT MERGE)
2011-05-31 16:02:54 -07:00
Adam Powell
60761f4fa5 am 31caa0e6: am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
* commit '31caa0e6e5c83cb03518ffe423ea5e37e452c8ae':
  Updated popup dialog 9 patches (light)
2011-05-31 16:02:41 -07:00
Joe Onorato
7052f307f4 am 7f818d0a: am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
* commit '7f818d0a97ecd7793811ff5549a4b67521d93f49':
  Move status bar icons to sw600.
2011-05-31 16:02:26 -07:00
Jeff Hamilton
e00ef00873 am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
  Swap Mifare for MIFARE.
2011-05-31 16:00:46 -07:00
Joe Onorato
256801780f Merge "Merge commit 'fce12613' into HEAD" 2011-05-31 15:35:11 -07:00
James Dong
c51e224b0a Merge "Add some comment to MediaRecorder.stop() about the stop() failure (-1007)" 2011-05-31 14:33:20 -07:00
Chet Haase
326e12236c Merge "Fixes for AnimationDrawable" 2011-05-31 14:24:22 -07:00
Joe Onorato
6a045ca18f Merge commit 'fce12613' into HEAD
Conflicts:
	core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
	core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout/status_bar_latest_event_content_large_icon.xml

Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
2011-05-31 14:11:58 -07:00
Daniel Sandler
3a4b8bb675 Merge "Turn off navbar by default...again." 2011-05-31 13:22:30 -07:00
Daniel Sandler
37445f5026 Turn off navbar by default...again.
Change-Id: I8471e31f3125dda7972a579bf4cf41ee091770ca
2011-05-31 16:21:36 -04:00
Daniel Sandler
67f5e514c7 Merge "Move navigation bar to right-hand-side of seascape." 2011-05-31 13:17:33 -07:00
Svetoslav Ganov
3b92427e68 Merge "Updating the API since I forgot after rebase" 2011-05-31 12:53:12 -07:00
Svetoslav Ganov
678ba5c57d Updating the API since I forgot after rebase
Change-Id: I15e0f8235b2981cd637717d13f57e3b71c30575b
2011-05-31 12:52:41 -07:00
Daniel Sandler
f86f898f8a Move navigation bar to right-hand-side of seascape.
This means the navbar will either be at the bottom (portrait
and reverse portrait) or the right (landscape and seascape)
irrespective of the physical bottom of the device.

Change-Id: Ib51cab22f246785c9cebcc688bcdb848eb776361
2011-05-31 15:46:14 -04:00
Joe Onorato
e36364ce0f Merge "Reduce log spew." 2011-05-31 12:44:13 -07:00
Svetoslav Ganov
b1af3a2d1f Merge "Accessibility serviceconfiguration via meta-data" 2011-05-31 12:05:54 -07:00
Svetoslav Ganov
cc4053e031 Accessibility serviceconfiguration via meta-data
Note: This is a part of two CL change and contains the
      system changes without updates to the settings.

1. Added a mechanism for configuring an accessibility service via
   XML file specified in a meta-data tag (similar to IMEs).

2. Added property for specifying a settings activity for an
   accessibility service.

3. Refactored the APIs in AccessibilityManager to return
   lists of AccessiblityServiceInfo instead ServiceInfo
   since the former describes an AccessibilityService in
   particular (similar to IMEs).

Change-Id: Ie8781bb7e0cdb329e583b6702a612a507367ad7b
2011-05-31 12:04:18 -07:00
Fabrice Di Meglio
798a3fe167 Merge "Fix default for getAbsoluteGravity()" 2011-05-31 11:56:59 -07:00
Gilles Debunne
da188fbe4b Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews" 2011-05-31 10:41:58 -07:00
Martijn Coenen
fe6dfd504b Implement Mifare Ultralight-C detection (API).
Bug: 3398465
Change-Id: Ieb60deedfde5af4494a14b3e322c5a61ae75aaf9
2011-05-31 10:30:56 -07:00
Marco Nelissen
e368c9a8ad Merge "Fix crash when nesting Picture recording." 2011-05-31 10:26:17 -07:00
Eric Laurent
923da873c8 Merge "Removed interface to load audio effects libraries" 2011-05-31 10:26:00 -07:00
Marco Nelissen
9743547cde Fix crash when nesting Picture recording.
b/4490619, http://code.google.com/p/android/issues/detail?id=16644

Change-Id: Ia227c87cba61e0d0b6f86b01a064a3eefe447fe1
2011-05-31 10:23:41 -07:00
Chet Haase
f5534a0785 Fixes for AnimationDrawable
Set up AnimationDrawable with an initial frame when it is
constructed from code (via addFrame()). This is equivalent to
what is done when it is constructed via xml resources.

Change-Id: I86784a241268aa2d03af8edecbc80a7cc3548e19
2011-05-31 07:22:51 -07:00
Kristian Monsen
2032eee0c1 Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy
This is the WebView part, passing the bypass list to
the native side.

Moved some code to JWebCoreJavaBridge.java because
because sendStaticMessage only takes one argument.

Needs CL in external/webkit:
https://android-git.corp.google.com/g/#change,112401

Needs following CL in external/chromium:
https://android-git.corp.google.com/g/#change,111832

Change-Id: Ib548bdcbc9eb22bbb8f2754808840052bd3ec80e
2011-05-31 14:54:51 +01:00
Tadashi G. Takaoka
e6a406753e Merge "Fix input type judgment of WebTextView" 2011-05-31 01:55:32 -07:00
Tadashi G. Takaoka
d555e5dccc Fix input type judgment of WebTextView
Bug: 4490948
Cherry-pick: I232b8f13
Change-Id: I09a7e829edd7ca8d54fa109dc14b4a3946de0f1b
2011-05-31 16:27:28 +09:00
satok
9b4157935a Use isAuxiliary instead of ExtraValue for the auxiliary subtypes.
Change-Id: Ibce4f884e697ca789b9942cf3abad43741040a87
2011-05-30 22:44:48 +09:00
Adam Powell
39a8dc4aaf Fix bug 4499292 - ActionBar tabs don't show the first time
Fix an order of operations issue with actionbar tab initialization.

Change-Id: Ie1b1c76614eafc68e0069985b93683b44699b958
2011-05-27 18:44:00 -07:00
Fabrice Di Meglio
c05aace48a Fix default for getAbsoluteGravity()
- remove LEFT as default, keep it as it is given (because apply() is doing CENTER_HORIZONTAL)
- update unit tests

Change-Id: I294621c5d5c7d675a715c15cb10947d026539b21
2011-05-27 17:52:37 -07:00
Eric Laurent
8f18cf5574 Removed interface to load audio effects libraries
Removed unused functions allowing dynamic loading of audio effects libraries
from effects factory API.

Change-Id: I06cc5a51dc10aca87c7a8687bbb874babd711eca
2011-05-27 17:51:52 -07:00
Elliott Hughes
7999592e25 Merge "FileOutputStream guarantees to open O_TRUNC (unless you explicitly ask otherwise)." 2011-05-27 17:15:55 -07:00
Mathias Agopian
73e0bc805a 9-axis sensor fusion with Kalman filter
Add support for 9-axis gravity and linear-acceleration sensors
virtual orientation sensor using 9-axis fusion

Change-Id: I6717539373fce781c10e97b6fa59f68a831a592f
2011-05-27 17:04:55 -07:00
Mathias Agopian
48a542aabe Merge "model rotation can now be controlled by the device's sensors" 2011-05-27 17:02:27 -07:00
Mathias Agopian
1c0b33115f Merge "Fix a few issues with sensors reference-counting" 2011-05-27 17:02:02 -07:00
Svetoslav Ganov
ed9a34d54b Merge "Refatoring a bit of accessibility code" 2011-05-27 16:40:17 -07:00
Svetoslav Ganov
bad9d97693 Refatoring a bit of accessibility code
Change-Id: I4df1741b622b21176c10311da0dc6347ca6fb390
2011-05-27 16:39:18 -07:00
Mathias Agopian
9c539ccebf Merge "sensorservice can now be ran standalone" 2011-05-27 16:37:51 -07:00
Mathias Agopian
35ccf46533 model rotation can now be controlled by the device's sensors 2011-05-27 16:36:58 -07:00
Mathias Agopian
9ff73de08f Fix a few issues with sensors reference-counting 2011-05-27 16:36:58 -07:00
Elliott Hughes
d7eedc0a69 FileOutputStream guarantees to open O_TRUNC (unless you explicitly ask otherwise).
Change-Id: Ibd2f247d8e52b2814729c93442ae197c186660f6
2011-05-27 16:35:55 -07:00
Mathias Agopian
c12b7ba81e sensorservice can now be ran standalone
Change-Id: I6e757f31f1e020046038e5ab84e71b8689a0aed3
2011-05-27 16:35:11 -07:00
Gilles Debunne
e8e833fbe8 Merge "Replacement spans correctly measured in TextView" 2011-05-27 16:12:19 -07:00
Gilles Debunne
d4bb0b01c6 Fix for bug 4499752 - Detect nulled layouts in HandleViews
Change-Id: I6a7289150bf461cdf4cca0aff4aa4a0400e0d553
2011-05-27 16:02:40 -07:00
Fabrice Di Meglio
6e10b08ba9 Merge "Fix overrides of isLayoutRtl(Drawable dr)" 2011-05-27 15:35:12 -07:00
Adam Powell
0d54201b1e Merge "Fix bug 4399686 - missing menu after returning from fullscreen video playback in browser" 2011-05-27 15:32:44 -07:00
Adam Powell
3526556135 Fix bug 4399686 - missing menu after returning from fullscreen video
playback in browser

Change-Id: I992c6b1b4db738f937646e0dcac1c83fa5ab4e35
2011-05-27 15:29:41 -07:00
Eric Laurent
c32c0093a4 Merge "New effect library API" 2011-05-27 15:26:25 -07:00
Eric Laurent
0fb66c2b83 New effect library API
Moved and renamed media/EffectApi.h to hardware/audio_effect.h
Modified the effect library API to expose a library info structure
containing an interface functions table.
Also removed enums for audio channels, audio format and devices
from effect API and use values from system/audio.h instead.

Modified effects factory to support new library interface format and
load libraries and efffects listed in audio_effects.conf file.
The file audio_effects.conf is first loaded from /vendor/etc and
then from /system/etc/audio_effects.conf if not found.

Modified existing effect libraries to implement the new library interface.

Change-Id: Ie52351e071b6d352fa2fbc06c3846686f8c45df9
2011-05-27 15:15:00 -07:00