2735 Commits

Author SHA1 Message Date
Gloria Wang
454b2d1c34 am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
* commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
2011-03-17 12:38:40 -07:00
Gloria Wang
def35f7a47 Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 2011-03-17 10:49:43 -07:00
Gloria Wang
f8bf3c46f5 Fix for 4089881.
- Add one more parameter in the interface of DrmEvent and its subclasses
  DrmInfoEvent and DrmErrorEvent
- Send back DrmInfo in the response of async processDrmInfo calls

Change-Id: Ia9b1a641296629a19ae4ffa7913e6c878fd340f8
2011-03-16 21:36:30 -07:00
Michael Kolb
0677d2526d am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
* commit 'd799caa9a6623de4af581bebc9759272c10b6588':
  deprecate getVisibleTitleHeight
2011-03-16 12:35:42 -07:00
Jeff Brown
5949f89f3c Merge "Add 3D mode key and others." 2011-03-16 11:46:00 -07:00
Jeff Brown
9812aed276 Add 3D mode key and others.
Related to an AOSP change request.

Change-Id: I3f4f84b56a1af626a8783f5ecbb823eb12ba9fbe
2011-03-16 11:31:42 -07:00
Michael Kolb
e54f66524e deprecate getVisibleTitleHeight
Bug: 4104535

Change-Id: I8a6ef21d38a25848efa28e2c06cf2da0ff7af9c4
2011-03-16 09:25:23 -07:00
satok
35267f178c Merge "Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView" 2011-03-15 23:13:56 -07:00
satok
adb435835f Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView
- CorrectionSpan is a span which has suggestions made by IME.
This has a function to change the current IME to other IME specified
in this span. For security reasons, only the current IME
is allowed to use this function through InputConnection.
(IME token is used for checking the validity of it.).

- CorrectionSpan stores following information:

flags, subtype Id, InputMethodInfo Id, suggests, locale, original string

Change-Id: Id3abc9ea4d11753cdc4f483a2bb3128f49ba198a
2011-03-16 14:44:37 +09:00
Dianne Hackborn
b1a6e439f6 Add new PreferenceActivity API for settings.
Need to redirect to a different activity when on non-xlarge screens.

Change-Id: I8cf4793b117325604d29ecc4478dbf10322a4689
2011-03-15 16:23:01 -07:00
Mike Lockwood
688d8412bd am 0958fb10: am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
* commit '0958fb1068ee1b5e6c40eee16d943a664b1124b4':
  Add support for USB accessory serial numbers
2011-03-14 17:47:49 -07:00
Gloria Wang
5c4421f73f am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
* commit '67718e076422f8f28f4e30a39df9e462ef32d19b':
  For issue 4082089 Add more info and error events into the DRM framework
2011-03-14 17:41:42 -07:00
Mike Lockwood
221830b93d Merge "Add support for USB accessory serial numbers" into honeycomb-mr1 2011-03-14 17:39:43 -07:00
Mike Lockwood
015b1ecaec Add support for USB accessory serial numbers
Change-Id: I47b79f091b300ced60bfc61eff2f771139663aae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 20:10:47 -04:00
Gloria Wang
27b277779c For issue 4082089
Add more info and error events into the DRM framework

Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
2011-03-14 15:29:08 -07:00
Dianne Hackborn
df35762758 am ce3bcbad: am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1
* commit 'ce3bcbade5ca3eac5bae2e06fa37d17f00006a15':
  Fix issues #4087362 and #4087356
2011-03-11 23:10:55 -08:00
Mike Lockwood
e1976e5c61 am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1
* commit '3b473d958c46ea6511b9599f727b47636e5cbc4a':
  USB: minor cleanup work
2011-03-11 23:10:41 -08:00
Dianne Hackborn
9ff6483843 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 2011-03-11 18:01:47 -08:00
Mike Lockwood
62cfeeb821 USB: minor cleanup work
Bug: 4067029

Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 18:51:29 -05:00
Dianne Hackborn
cf407ad88b Fix issues #4087362 and #4087356
4087362: Provide a safer way to call DialogFragment.dismiss()
4087356: PreferenceActivity.invalidateHeaders() can cause
IllegalStateException: Can not perform this action after onSaveInstanceState

These are very safe; the first is just a new public API that
allows you to use an existing feature in DialogFragment, and the
second just uses the version of commit that avoids the failure if
happening at a point where the operation would be lost if restored
from the last state (which is no big deal for preferences).

Change-Id: I53971c9fb1efdcd599694cdcd4585b81afc156b8
2011-03-11 13:48:32 -08:00
Mike Lockwood
b46ecb3526 am 75c95e9a: am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
* commit '75c95e9a6d5a91b660af62f72b5a3bac0f5c3811':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
2011-03-11 11:53:13 -08:00
Mike Lockwood
a75075e167 UsbManager: Hide APIs not needed for USB host or accessory support.
Bug: 4067029

Change-Id: Ib63ab95a6571d6a691834bfb583a68d2e4cfd22e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 11:26:38 -05:00
Mike Lockwood
acc29cc91b UsbDevice: Move IO related methods to new UsbDeviceConnection class
UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.

Bug: 4067029

Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 10:24:21 -05:00
Gilles Debunne
180bb1bf26 Refactor in TextView's HandleViews.
HandleView had a reference on its Controller, and Controller had
a reference to its HandleView.

This large refactoring breaks this dependency, creating smarter
HandleView subclasses that don't have to delegate to the controller
anymore.

Change-Id: I472621f747cdc78fd8b2bba84c0edc62cb2f6316
2011-03-10 16:55:28 -08:00
Mike Lockwood
26d7eef69e am 84edf14b: am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
* commit '84edf14b62eaf3304252bb76b0b2ca3f518c8d54':
  UsbAccessory: Add URI string, replace type string with description
2011-03-10 07:56:59 -08:00
Mike Lockwood
cc08c439bc Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1 2011-03-10 07:50:30 -08:00
Jeff Brown
9b12dbdd1e am 4ffdca06: am 3de30a4c: Update API.
* commit '4ffdca06ec5575ddaa215941c1cc21de96e76bcb':
  Update API.
2011-03-09 19:37:49 -08:00
Jeff Brown
3de30a4c1e Update API.
Not sure the changes were correctly rebased last time.

Change-Id: If6ab4014f312bef240df60f0b1cd6d923f472836
2011-03-09 19:13:11 -08:00
Mike Lockwood
ac36d7c715 UsbAccessory: Add URI string, replace type string with description
This is a first step toward adding USB accessory URI support

BUG: 4073248

Modified USB accessory matching logic to look only at manufacturer, model and version
(description and URI are not considered when matching apps to accessories)

Also added test for USB accessory protocol version to accessorytest

BUG: 4080288

Change-Id: I992a3433c74efa7a7db37bf030f02c1f0c92f9e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 22:12:49 -05:00
Jeff Brown
5a3d6cc188 am e6f0ae12: am efd3266b: Input improvements and bug fixes.
* commit 'e6f0ae12b18819424dd8395b433a8fc9caefa77b':
  Input improvements and bug fixes.
2011-03-09 18:39:46 -08:00
Jeff Brown
efd3266b71 Input improvements and bug fixes.
Associate each motion axis with the source from which it comes.
It is possible for multiple sources of the same device to define
the same axis.  This fixes new API that was introduced in MR1.
(Bug: 4066146)

Fixed a bug that might cause a segfault when using a trackball.

Only fade out the mouse pointer when touching the touch screen,
ignore other touch pads.

Changed the plural "sources" to "source" in several places in
the InputReader where we intend to refer to a particular source
rather than to a combination of sources.

Improved the batching code to support batching events from different
sources of the same device in parallel.  (Bug: 3391564)

Change-Id: I0189e18e464338f126f7bf94370b928e1b1695f2
2011-03-09 18:30:28 -08:00
Patrick Scott
888f0654fd am 5d534f28: am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit '5d534f288d0c29337458e267fd207236bc23fec5':
  Pass the auto login header information to the app.
2011-03-09 05:10:34 -08:00
Patrick Scott
ea44c7c714 Merge "Pass the auto login header information to the app." into honeycomb-mr1 2011-03-09 05:05:21 -08:00
Mike Lockwood
77e1a4c57e am 093cf07f: am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '093cf07f3c58a6553c415d750edba1a75b269f05':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:57:14 -08:00
Mike Lockwood
3a68b8338b USB: Add API and dialog for apps to request permissions for USB devices and accessories
New APIs:

UsbManager.hasPermission returns true if the caller has permission
for the given device or accessory

UsbManager.requestPermission poses a dialog to allow the user to give the caller
permission for the device or accessory.
Result is returned via a PendingIntent.
No dialog is displayed if the caller already has permission.

Also moved UsbResolverActivity to SystemUI package

BUG: 4069037

Change-Id: I93be769501a8776b49ac26e468af19f8fa2114c9
2011-03-08 21:22:19 -05:00
Patrick Scott
85a50ff48b Pass the auto login header information to the app.
Add a new callback to handle auto login requests.

Bug: 3367381
Change-Id: I2ee8038cdf8a4ff9d1d3de0c871a0c60f1769655
2011-03-08 08:35:54 -05:00
Jesse Wilson
102930a0de Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1 2011-03-07 23:23:36 -08:00
Chia-chi Yeh
6b70f569ad am 0588f16b: am ab7c3245: Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
* commit '0588f16b5699f24f4524a3c308bf32feb3be29c9':
  NEW_API: Unhide RTP APIs.
2011-03-07 15:44:35 -08:00
Chia-chi Yeh
6defd2d47e NEW_API: Unhide RTP APIs.
This change unhides RTP related classes including AudioCodec,
AudioGroup, AudioStream, and RtpStream. This allows developers
to control audio streams directly and also makes conference
calls possible with the combination of the public SIP APIs.

Change-Id: Idfd4edf65a1cbf3245ec2786fbc03b06438b0fb3
2011-03-08 05:59:09 +08:00
Vasu Nori
670e5ddfa6 am f114e67e: am 0f73fe1c: Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
* commit 'f114e67edd85e874b54f0a7061addf4b43d35076':
  bug:3513950 Rename "completedDownload" to "addCompletedDownload"
2011-03-07 12:55:38 -08:00
Vasu Nori
0f73fe1c84 Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1 2011-03-07 12:46:59 -08:00
Vasu Nori
3728130310 bug:3513950 Rename "completedDownload" to "addCompletedDownload"
Change-Id: I28b33a0268309d74fd2512b5bdb599f38ff3a96d
2011-03-07 11:51:14 -08:00
Jeff Brown
f0210c3621 Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1 2011-03-07 11:47:58 -08:00
Andreas Huber
bfa40efc9b Merge "Added more metadata published by the MediaMetaDataRetriever" 2011-03-07 11:03:28 -08:00
Jesse Wilson
dfed7c006a Remove deprecated and unused entryEvicted method.
Change-Id: I30ccf3d798a3ebfc88a1b340efaaacf524d56fae
http://b/3461302
2011-03-07 09:07:07 -08:00
Jesse Wilson
27f4bd7a47 Merge "Remove deprecated and unused entryEvicted method." 2011-03-07 08:47:43 -08:00
Kristian Monsen
9f5f7af6cc Deprecating webkit API's that might not be supported in the future do not merge
Change-Id: I7ed9498a24aceee529397bbe1ed96a15f834b4eb
2011-03-07 13:01:28 +00:00
Jeff Brown
8529745b27 Joystick tweaks. (DO NOT MERGE)
Ensure that the joystick can always reach -1.0, 0.0 and 1.0 positions
even when noise filtering is applied.  (Bug: 3514510)

Add support for a few more standard axes.

Add additional mapping modes for axes.
Some axes are inverted from standard interpretation
or are actually intended to be split into two distict axes
such as left/right trigger controls or accelerator/brake.

Add key layout file for a G25 racing wheel and XBox 360 controller
to tweak behavior.  They work fine without them but the axis mappings
are not ideal.

Change-Id: I0fddd90309af4dc14d35f34fe99ed6e521c0b7c7
2011-03-04 19:12:41 -08:00
Jeff Brown
3a22fa0570 Joystick tweaks.
Ensure that the joystick can always reach -1.0, 0.0 and 1.0 positions
even when noise filtering is applied.  (Bug: 3514510)

Add support for a few more standard axes.

Add additional mapping modes for axes.
Some axes are inverted from standard interpretation
or are actually intended to be split into two distict axes
such as left/right trigger controls or accelerator/brake.

Add key layout file for a G25 racing wheel and XBox 360 controller
to tweak behavior.  They work fine without them but the axis mappings
are not ideal.

Change-Id: Id4c86a0a272331c680039a9bde6815bb7eba44ab
2011-03-04 18:53:32 -08:00
Gilles Debunne
78e7684713 Merge "getTextRunCursor gets deprecated in SpannableStringBuilder" into honeycomb-mr1 2011-03-04 11:36:17 -08:00