46252 Commits

Author SHA1 Message Date
Wink Saville
8366b23317 am 23fe0059: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
* commit '23fe005900aab2955052e0c9dc36ca05ea351a1a':
  Fixing the write of BackgroundData setting, DO NOT MERGE.
2011-03-01 10:58:05 -08:00
Gilles Debunne
5bf7658cb8 Merge "Removed ViewTreeObserver null checks" 2011-03-01 10:50:00 -08:00
Gilles Debunne
0357e5b2fe Merge "Scrollable tabs are correctly displayed." 2011-03-01 10:49:23 -08:00
Adam Powell
857447f1f9 Merge "Fix a bug where the lazy-initialized ActionBar object was being too lazy." 2011-03-01 10:46:42 -08:00
Adam Powell
763cbb134f Fix a bug where the lazy-initialized ActionBar object was being too lazy.
Change-Id: I80dc06deffd1df8cc8ae96fd878d66a101a17086
2011-03-01 10:45:34 -08:00
Eric Rowe
99cf1e0ca3 Merge "Add test cases for AudioManager SCO methods." 2011-03-01 10:31:26 -08:00
Jamie Gennis
29f87f76bc Merge "Add an OMX IL API for querying buffer usage flags." 2011-03-01 10:25:38 -08:00
Jamie Gennis
dbb520e0a0 Merge "Fix error recovery in Stagefright init." 2011-03-01 10:24:55 -08:00
Mike Corrigan
bd15112a29 Fix the display priority of the airplane mode icon.
The airplane icon is used as a fallback when no
other radios are available *and* the AIRPLANE_MODE_ON system
setting is set to 1. (NetworkController now tracks changes to
the setting via ACTION_AIRPLANE_MODE_CHANGED broadcasts.)

This fixes wifi-only devices, for which the previous logic
did not correctly and consistently detect airplane mode.

Bug: 3489820
Change-Id: I226bb0e977f6a5fd3f2d829ba51ca54c5c910ef3
2011-03-01 13:20:07 -05:00
Mike Lockwood
7a976a4370 Fix UsbDeviceSettingsManager locking.
Change-Id: I93117ce791de95b0ab95017601f5d90ed5dd7a6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 09:40:07 -08:00
Kenny Root
c39bb4aaa7 Switch to returnCode for IPackageDeleteObserver
Before the IPackageDeleteObserver only knew whether the deletion
succeeded or failed, but not the reason why.

Bug: 2520191
Change-Id: I1f0d7c04f06c539660b6e17e7e133defb0f61b5b
2011-03-01 09:27:57 -08:00
Mike Lockwood
5d019f0e6d am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
* commit 'c01e201f12149ca96593af4e18133d3b2fce5546':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
2011-03-01 09:12:49 -08:00
Mike Lockwood
3fa12d459d am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
* commit 'fc88f94fc32fc010b153af32dea8e1fd4bae1f19':
  DO NOT MERGE: Clean up USB notifications:
2011-03-01 09:12:45 -08:00
Mike Lockwood
91dceb8143 am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
* commit '54e96c69d068593f1d5893be6067509b07abdadc':
  DO NOT MERGE UsbManager: squashed commit of:
2011-03-01 09:12:31 -08:00
Mike Lockwood
8697f397e2 am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
* commit 'f41768c5837a078239e92d8fa1d2155394e4b6ac':
  Give system server permission to access USB. DO NOT MERGE
2011-03-01 09:12:27 -08:00
Xavier Ducrohet
2d5ed07940 am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
* commit '7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b':
  Merge 1911a6f7 into gingerbread. do not merge.
2011-03-01 09:12:15 -08:00
Mike Lockwood
c4308f01c9 Move USB framework support from android.hardware to android.hardware.usb package
Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 08:07:20 -08:00
Chet Haase
108500ab22 Merge "Cleanup of docs for ViewPropertyAnimator class" 2011-03-01 07:41:42 -08:00
Chet Haase
d666cf320d Cleanup of docs for ViewPropertyAnimator class
Fixed the copyright date, spec'd auto-canceling behavior of various methods,
fixed various typos.

Change-Id: I0db74787275890557a3ad8d617b69daeef2413ee
2011-03-01 07:38:16 -08:00
Eric Fischer
43cdf9b419 am ae7fb488: (-s ours) am 04a536af: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'ae7fb4887394615b58c4e97fc5b1ad2e04441903':
  Import revised translations.  DO NOT MERGE
2011-02-28 22:23:03 -08:00
Irfan Sheriff
d86dbb9e00 am 5af7cf7c: am f9e2a491: Fix issue to clear scan alarms
* commit '5af7cf7c558e6febfa5d48b62900929743d2f7bb':
  Fix issue to clear scan alarms
2011-02-28 22:22:37 -08:00
Adam Powell
6ade7c2624 Merge "Fix bug 3497341 - take list padding into account when drawing ExpandableListView indicators" 2011-02-28 22:01:31 -08:00
Adam Powell
3e5e6aced9 Fix bug 3497341 - take list padding into account when drawing
ExpandableListView indicators

Change-Id: Idf4d4f28f495a453b871ac7dbe7059f38812ff87
2011-02-28 21:57:42 -08:00
Adam Powell
710df09438 Merge "Fix bug 3497307 - Fix issues with FEATURE_ACTION_MODE_OVERLAY" 2011-02-28 21:49:40 -08:00
Adam Powell
d3c9704d3e Fix bug 3497307 - Fix issues with FEATURE_ACTION_MODE_OVERLAY
Properly close down overlay windows when decor is detached. Delay
opening popup overlays to prevent issues when restoring instance
state.

Change-Id: I7ff44ce65e78c0172a12a9ddfe11460c885593ca
2011-02-28 21:40:26 -08:00
Christopher Tate
ce8ad5a912 Merge "Make sure to properly default the screen size during wallpaper restore" 2011-02-28 19:37:06 -08:00
Christopher Tate
7f765cf588 Make sure to properly default the screen size during wallpaper restore
The wallpaper service claims a desired width/height of (-1,-1) during
initial setup, so look to the default display's metrics if necessary.

Change-Id: I341f12fb7b0b9d6b7761c277f23fc68fa5355256
2011-02-28 19:22:13 -08:00
Xavier Ducrohet
30635b02c0 Merge "Add notice files for aapt and aidl." 2011-02-28 19:19:23 -08:00
Gilles Debunne
52a5e65883 Scrollable tabs are correctly displayed.
Bug 3495561

Change-Id: I1fe4962ddbe2435c335c76769d37f57f4b30a3b3
2011-02-28 18:41:46 -08:00
Daniel Sandler
ca93c1e4b4 Merge "resolved conflicts for merge of cfeaa492 to master" 2011-02-28 18:38:02 -08:00
Dianne Hackborn
a6cbf50c76 Merge "Add ParcelFileDescriptor APIs to get raw fd." 2011-02-28 18:36:48 -08:00
Xavier Ducrohet
defdae61b1 Add notice files for aapt and aidl.
Change-Id: I51da138475618287760043059790aba87f4c3f35
2011-02-28 18:36:41 -08:00
Daniel Sandler
fab337648d resolved conflicts for merge of cfeaa492 to master
Change-Id: I6ee4e3f822cb91008b1ca64ab9a6673278e501e0
2011-02-28 21:31:14 -05:00
Adam Powell
f37fccd9d8 Merge "Change behavior of multitouch in scrolling views." 2011-02-28 18:16:14 -08:00
Adam Powell
9bc30d3132 Change behavior of multitouch in scrolling views.
New pointers touching the screen always become the active pointer.

Still to do: allow flings until another pointer moves enough to stop
it. Currently flings will be immediately stopped by the other pointers
still contacting the screen.

Change-Id: Ic1c7bf98dcf40252593cec0ab1f0d524aaeed8e4
2011-02-28 18:15:23 -08:00
Fred Quintana
082aa9cdc4 Merge "Make the AccountManagerService clear old grants when the package that the grants refer to is no longer installed." 2011-02-28 18:09:58 -08:00
Eric Rowe
835d8ee61e Add test cases for AudioManager SCO methods.
Add test cases for AudioManager.startBluetoothSco() and
AudioManager.stopBluetoothSco()

Bug: http://b/3292864
Change-Id: I743c8d732270262fbaaff79a53d43cedcd5de528
2011-02-28 18:07:51 -08:00
Dianne Hackborn
7fff2d19a2 am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."
* commit '1de4a2ca58df9bd21e054742f52e0af7a2ed5864':
  Fix leak when keylock is recreated.
2011-02-28 18:06:46 -08:00
Dianne Hackborn
c9119f5034 Add ParcelFileDescriptor APIs to get raw fd.
Change-Id: I66ba72ffffd27237e60c9411453eef950ae62705
2011-02-28 18:03:26 -08:00
Dianne Hackborn
1de4a2ca58 am 62619392: Merge "Fix leak when keylock is recreated."
* commit '626193926df0b3c7236e5c244f30d797d9192e0d':
  Fix leak when keylock is recreated.
2011-02-28 18:03:12 -08:00
Dianne Hackborn
626193926d Merge "Fix leak when keylock is recreated." 2011-02-28 17:54:54 -08:00
Jeff Brown
bb57948049 Merge "Fix inverted scrolling condition in lists." 2011-02-28 17:50:33 -08:00
Mike Lockwood
e8be6a8d5b Merge "CameraBrowser: Add USB device filter meta-data for digital cameras" 2011-02-28 17:46:04 -08:00
Mike Lockwood
eb3885d692 Merge "USB accessory support library" 2011-02-28 17:45:08 -08:00
Mike Lockwood
0fd3c4a1e2 CameraBrowser: Add USB device filter meta-data for digital cameras
This is used by the USB service to associate Gallery with PTP cameras.
Removed unnecessary broadcast receiver

Change-Id: Ifd78aa94f69cb7d6ec0b557313e90bb79812f15d
2011-02-28 17:26:06 -08:00
Mike Lockwood
2755531562 USB accessory support library
This provides a mechanism for developing applications to work with
USB accessories in versions of android prior to the introduction
of the android.hardware.UsbManager APIs.

Applications should link against the com.google.android.usb library
to use this support.

Change-Id: I48ff80467fd9a6667aa84a758eca754132f546b9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-28 17:25:57 -08:00
Mike Lockwood
c93f67c2b7 Merge "Add platform features for USB host and USB accessory support." 2011-02-28 17:05:12 -08:00
Mike Lockwood
fae640b174 Merge "UsbManager: Enhancements for managing USB devices and accessories" 2011-02-28 17:04:23 -08:00
Mike Lockwood
f4ca247158 Add platform features for USB host and USB accessory support.
Also removed config_hasUsbHostSupport framework resource, which is now obsolete.

Change-Id: I6f18cc1c4f68085de8b8363e1b5edff79aff404f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-28 17:00:46 -08:00
Mike Lockwood
02eb8746de UsbManager: Enhancements for managing USB devices and accessories
When a USB device or accessory is connected, the UsbService now asks the
user which application to associate with the device or accessory.
Applications interested in devices or accessories must specify the
devices they work with via meta-data attached to their manifest.
Permission to communicate with the device is assigned when the user chooses
the activity to use for the device.
The user has the option of clicking the "always use this application" checkbox
to make the assignment automatic in the future.
The user may later clear this preference and revoke permission for an application
to have permission to communicate with the device by clicking the "Clear defaults"
button for the activity in the Manage Applications panel in Settings.

Added class UsbResolveActivity (a subclass or ResolveActivity for choosing
an activity for a USB device or accessory)

Added UsbDeviceManager, which manages the mapping between USB devices/accessories
and applications, including default applications for devices and accessories,
and manages application permissions.

Add interface to allow Settings to clear device and accessory
preferences and permissions for an application.

Remove obsolete ACCESS_USB permission.

Add new signatureOrSystem MANAGE_USB permission to allow administrating
preferences and permissions.

Moved UsbService.java to a "usb" subdirectory, along with new classes
UsbResolveActivity and UsbDeviceManager.

Change-Id: I92554381e9779e68ce380daaee4e1401fb875703
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-28 17:00:45 -08:00