51608 Commits

Author SHA1 Message Date
Gilles Debunne
aa67eef1b6 Remove suggestion span underline on device rotation
Change-Id: I2fca995f839eff84ee8c62289f6f110ebb8dd321
2011-06-01 18:03:37 -07:00
Jean-Michel Trivi
d0bbdb02b2 Merge "Use channel mask instead of channel count for track creation" 2011-06-01 11:04:15 -07:00
Jean-Michel Trivi
5439223b56 Use channel mask instead of channel count for track creation
Record and playback objects (resp AudioRecord and AudioTrack)
are created using a channel mask, but this information is lost
in the mixer because only the channel count is known to
AudioFlinger. A channel count can always be derived from a
channel mask.

The change consists in:
- disambiguiting variable names for channel masks and counts
- passing the mask information from the client to AudioFlinger
 and the mixer.
- when using the DIRECT ouput, only verifying the format of
 the track is compatible with the output's for PCM.

Change-Id: I50d87bfb7d7afcabdf5f12d4ab75ef3a54132c0e
2011-06-01 10:55:29 -07:00
Gilles Debunne
829de65b9a Merge "Select all for text shown as an icon on smaller screens" 2011-06-01 10:13:42 -07:00
Gilles Debunne
703d3279e8 Merge "ActionBar makes room for icons when no title is provided" 2011-06-01 10:12:11 -07:00
Wink Saville
d1a1c09cb0 am 7f9d3210: am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE
* commit '7f9d3210cbef5c5e797f78fd3a2f836979de32e3':
  Remove or disable some verbose debugging.
2011-05-31 23:41:32 -07:00
Dianne Hackborn
4d710ad53e Merge "resolved conflicts for merge of 590ec479 to master" 2011-05-31 23:34:46 -07:00
Dianne Hackborn
36f80f3a5a resolved conflicts for merge of 590ec479 to master
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
2011-05-31 23:11:16 -07:00
Joe Onorato
0d8f66f08d Put the enum constants into the api file.
Bug: 4292741
Change-Id: Ia6d934e1202f818a967ffe469aa5e4f15f4648b5
2011-05-31 18:17:20 -07:00
Svetoslav Ganov
86d2c5fa9a Merge "Removed unused service declaration from core tests." 2011-05-31 18:13:16 -07:00
Svetoslav Ganov
9909d999b7 Removed unused service declaration from core tests.
bug:4513413

Change-Id: I722655a0840762a90e581e57b7890ccc52174a0c
2011-05-31 18:11:49 -07:00
Matthew Xie
646590ef0a Merge "Add public api BluetoothSocket.isConnected." 2011-05-31 18:04:36 -07:00
Mike Lockwood
bade424fdd Merge "UsbService: Refactor USB host and device support into two separate classes" 2011-05-31 17:54:05 -07:00
Mike Lockwood
46d0adf825 UsbService: Refactor USB host and device support into two separate classes
Host support is in UsbHostManager, device support is in UsbDeviceManager

Renamed UsbDeviceSettingsManager to UsbSettingsManager

Change-Id: Ib76e72957c233fa7f08f454d4d9a2a1da6368cc7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-31 20:52:06 -04:00
James Dong
7c2cb0c583 Merge "Send estimated bandwidth value as informational event when cache fetcher pauses" 2011-05-31 17:25:47 -07:00
Gilles Debunne
c619e74cc6 ActionBar makes room for icons when no title is provided
Change-Id: I5bd09e00b50496032deda40ea22367d727230611
2011-05-31 17:15:09 -07:00
Gilles Debunne
5e9af2ddf0 Select all for text shown as an icon on smaller screens
Text has been removed to leave space for 4 icons, that should fit
even in portrait mode.

Note: requires a definitive selectAll icon from designers.

Change-Id: I65547527e9ca872aa8888467f31fa7de9653fa77
2011-05-31 17:05:33 -07:00
Fabrice Di Meglio
38fd7cde0b Merge "Fix TextView potential NPE in isLayoutRtl()" 2011-05-31 16:57:55 -07:00
RoboErik
85284fbca7 Merge "Work on changing syncx to cal_syncx" 2011-05-31 16:44:04 -07:00
Fabrice Di Meglio
83fa41b06e Fix TextView potential NPE in isLayoutRtl()
- test if mDrawables can be null
- see bug #4517017 (was seen with Monkeys)

Change-Id: I07f04c88a238d1cae6fe89b0ab56fc2c456b8534
2011-05-31 16:35:18 -07:00
Mike Lockwood
b0aee3ee43 Merge "Move stringToFile utility from ConnectivityService to FileUtils" 2011-05-31 16:14:08 -07:00
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
a9d0febdd0 Send estimated bandwidth value as informational event when cache fetcher pauses
o Application can make informed decision about the available network bandwidth
  when cache fetcher pauses.

o Application can also adjust how frequently the bandwidth is estimated within
  a range from one second to one minute.

Change-Id: I90068001343e79da1886de03c565537787e1580b
2011-05-31 15:23:25 -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
RoboErik
be01039a7f Work on changing syncx to cal_syncx
Change-Id: I756ff09c43f39ad52a8793011d3192d59eb574eb
2011-05-31 13:25:10 -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