4885 Commits

Author SHA1 Message Date
Mike Lockwood
f25a7964a3 am 7e6f519c: am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
* commit '7e6f519c0704321461e256c919b4d554f23a4261':
  Clear default for USB device/accessory when new matching app is installed
2011-03-11 13:27:56 -08:00
Mike Lockwood
14c875eac7 Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 2011-03-11 13:24:01 -08:00
Mike Lockwood
c7d32d1065 Clear default for USB device/accessory when new matching app is installed
Bug: 4063041

Change-Id: Ia1b4f29d3e54ec21aa64407720d9d5db62855380
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 16:12:07 -05:00
Robert Greenwalt
2e7415564a am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
  DO NOT MERGE Backport of I1f55df8a from master.
2011-03-11 11:52:31 -08:00
Dianne Hackborn
9ebdd66465 am 8657427f: am 7b076307: Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
* commit '8657427f78494df43d129d88f50e0d7375592486':
  Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121
2011-03-11 10:51:11 -08:00
Dianne Hackborn
d3ac49889e am 1bada408: am 492eb33d: Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1
* commit '1bada408f94253c31ae49b1b00ed6263ce0ff229':
  Fix issue #4081756: Crash when un-stopping applications
2011-03-11 10:51:04 -08:00
Dianne Hackborn
7b076307bb Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 2011-03-11 10:39:46 -08:00
Dianne Hackborn
492eb33d54 Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 2011-03-11 10:38:52 -08:00
Mike Lockwood
dd0f9af116 am 4135cb8e: am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
* commit '4135cb8e43846e422bf760fd9b856c67cc4ec8f7':
  Support for USB accessory URIs
2011-03-11 06:06:52 -08:00
Robert Greenwalt
6b09916eb2 DO NOT MERGE Backport of I1f55df8a from master.
Fixes false reporting of NO_CONNECTION.
bug:4057115

Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6
2011-03-10 17:04:21 -08:00
Dianne Hackborn
cb44d96173 Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121
Need to resume the top activity after force removing a crashing
app's activities.

Change-Id: Id3384b2aa73039a9b1e72c2201d3ab0ef5b4f61f
2011-03-10 17:02:27 -08:00
Irfan Sheriff
4aeca7c590 Backup and restore IP and proxy settings
Bug: 4081954
Change-Id: I27266637c6ade0c5c8242792176d1edae0983446
2011-03-10 16:57:10 -08:00
Dianne Hackborn
a925cd4101 Fix issue #4081756: Crash when un-stopping applications
Change-Id: Ifc23481f8feaeacb410375eefd015ebdb997e39c
2011-03-10 13:18:20 -08:00
Mike Lockwood
024b4f1494 Support for USB accessory URIs
If a USB accessory is attached and we have no application that supports it,
display a dialog offering the user the option to visit the accessory's website
if the accessory has a URI.

Bug: 4073248

Change-Id: I30e2a802493fb6e203532a7f79402379c40bc3b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-10 14:35:33 -05: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
TK MUN
c01fd043a9 am 4bdab175: DO NOT MERGE WiMAX support
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
TK MUN
4bdab1751f DO NOT MERGE WiMAX support
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX

Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
2011-03-09 22:37:08 -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
Mike Lockwood
8fe7ca1d7d am 18d8a074: am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* commit '18d8a0748d3c42a31799e5ce7c7f4c2fd63d1896':
  MTP: Convert date created and modified values from seconds to milliseconds
  Update USB accessory compatibility library to support new requestPermission API
  UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:53:43 -08:00
Mike Lockwood
564f12ebe4 Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* changes:
  MTP: Convert date created and modified values from seconds to milliseconds
  Update USB accessory compatibility library to support new requestPermission API
  UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:47:10 -08:00
Jim Miller
37bad9e7ac am c00c887c: am 5c9248f6: Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
* commit 'c00c887c118849ac308f6fb1f6fad28b2929e6bb':
  Fix 4027057: Improve resolution of RecentApps thumbnail images.
2011-03-09 15:02:59 -08:00
Jim Miller
5c9248f668 Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1 2011-03-09 14:42:56 -08:00
Mike Lockwood
607710ad12 UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
Permission check should only happen in openAccessory()
Otherwise an application will not be able to check for the current accessory
and ask for permissions (if it is a suitable match for the application)

BUG: 4069037

Change-Id: If5b44ebda2e8077598d96629163cc74aa336589e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 16:43:35 -05:00
Mike Lockwood
e18a4067e0 am 094c9900: am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
* commit '094c9900de383f0934f74cedef0d24b6d8a14905':
  Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:51:16 -08:00
Mike Lockwood
2c3ed82600 Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1 2011-03-09 10:44:19 -08:00
Irfan Sheriff
eddeecf059 am 86587185: am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '865871850bcedd4b9da0536c8b41f3c1816e5f43':
  Persist wifi override in airplane mode
2011-03-09 09:36:40 -08:00
Mike Lockwood
c6f23e8521 Change UsbManager.requestPermission to only grant permission temporarily
If the user approves an application to access a USB device or accessory
without choosing it as the default application, then permission is granted
only until the device or accessory is disconnected.
Only applications chosen as the default choice have permissions assigned persistently.

BUG: 4061035

Change-Id: Ic4f6271a91b2fc56bbeef82c579e26d88c63ae56
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 12:33:00 -05:00
Irfan Sheriff
7ad85eb62f Merge "Persist wifi override in airplane mode" into honeycomb-mr1 2011-03-09 09:30:28 -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
9e8e4ea0a8 Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* changes:
  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:52:47 -08:00
Irfan Sheriff
658772f0e6 Persist wifi override in airplane mode
Persist the setting of wifi override in airplane mode
so that it can be restored on reboot

Bug: 3250824
Change-Id: I2af38c282ba55fc150fd9ef783d43600f0d4260f
2011-03-08 21:52:35 -08:00
Jim Miller
e70d506ab3 Fix 4027057: Improve resolution of RecentApps thumbnail images.
This fix ensures captured thumbnails in portrait mode have the
same resolution as those in landscape by fixing the horizontal
resolution and vertical resolution of the target image.

The returned image is now always the same size and matches
the landscape screen exactly. In portrait mode, it grabs
the upper portion of the screen based on the vertical dimension
of the target image.

Change-Id: I203c39843f2f21ca28f6ef0dffec308ce5cb39fb
2011-03-08 21:47:13 -08:00
Jim Miller
3e95ab97a2 am 88d2d039: am 3de6a9b6: Merge "Fix 4025684: Don\'t include wallpaper dimensions in bounds calculation" into honeycomb-mr1
* commit '88d2d0390d41eb37481936872f1a03db39b8526d':
  Fix 4025684: Don't include wallpaper dimensions in bounds calculation
2011-03-08 18:42:18 -08:00
Dianne Hackborn
2bf0410bd2 am 0aa403c3: am 09a31662: Merge "Fix issue #3505861: Need to decide large/xlarge screen size limits" into honeycomb-mr1
* commit '0aa403c3bddc1289537130a20f1b96b2863bbb7e':
  Fix issue #3505861: Need to decide large/xlarge screen size limits
2011-03-08 18:42:12 -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
Mike Lockwood
8c7d8c3ccb UsbService: Automatically use system apps by default if it is the only choice
If only one app is installed that supports a USB device or accessory
and that app is in the system partition, then use that activity by default
and rather than displaying the USB app chooser dialog.

BUG: 4060064

Change-Id: I49bf22a439e9676039b6f612c9bb622ab426066c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-08 20:32:15 -05:00
Jim Miller
3de6a9b692 Merge "Fix 4025684: Don't include wallpaper dimensions in bounds calculation" into honeycomb-mr1 2011-03-08 15:43:16 -08:00
Jim Miller
2aded18b0e Fix 4025684: Don't include wallpaper dimensions in bounds calculation
This fixes a bug where we would capture the statusbar region in
thumbnails because the wallpaper was used in the bounds calculation.

Change-Id: I572221e83c4c363afe90e59bece9a291ce694a15
2011-03-08 15:34:20 -08:00
Dianne Hackborn
cc1d9f7942 Fix issue #3505861: Need to decide large/xlarge screen size limits
Decided.

Change-Id: I8292d65e3d47755778fdf85207c49f160c756452
2011-03-08 10:33:55 -08:00
Irfan Sheriff
c23971b3e4 Handle client loss for a full connection
Bug: 3513246
Change-Id: I928544a05702bb004457e2b0d2eeb3c34f98edf9
2011-03-08 10:18:38 -08:00
Benoit Goby
1997069436 Add support for USB Ethernet adapters
Change-Id: Ie75cbcdb1b0c8965b59b89675a05175a1e9ebdd6
2011-03-04 15:42:23 -08:00
Ken Wakasa
abc093d477 am 74a909bc: am 6e38d26c: Merge "Fix the sort order of the input methods & subtypes in the settings." into honeycomb-mr1
* commit '74a909bc78e07b7626144ff3c4fc88fcd0d5b8d3':
  Fix the sort order of the input methods & subtypes in the settings.
2011-03-04 11:37:13 -08:00
Ken Wakasa
6e38d26c1e Merge "Fix the sort order of the input methods & subtypes in the settings." into honeycomb-mr1 2011-03-04 02:57:20 -08:00
Ken Wakasa
761eb3762f Fix the sort order of the input methods & subtypes in the settings.
It should have been the same as how the IME switcher panel does.

bug: 3364167
Change-Id: I48b98c9c4598720edf7cf09d1b9358a9ebed6051
2011-03-04 19:30:12 +09:00
Dianne Hackborn
fdcdd418e9 am 54b3cb17: am f8b8a3fa: Refector preferred activity code out of package manager.
* commit '54b3cb170cc8c80b196079131c3a04410cfff035':
  Refector preferred activity code out of package manager.
2011-03-04 01:10:58 -08:00
Dianne Hackborn
79f473e9ff am a6d2c62b: am 48f91e35: Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1
* commit 'a6d2c62b58075e338bb08f419ca1567d87d82dd2':
  Fix Fragment.onInflate() to actually work correctly.
2011-03-04 01:01:47 -08:00
Svetoslav Ganov
0dc4f79ba4 am 5f96962c: am 1e158e9c: Merge "Propagating core settings to the system process." into honeycomb-mr1
* commit '5f96962caa23eec25d449e47a2f677d1ff8e53c9':
  Propagating core settings to the system process.
2011-03-04 01:01:44 -08:00
Rebecca Schultz Zavin
7a76e222d7 am 0b20a705: am 327e94da: Merge "set max_events_per_sec to 55" into honeycomb-mr1
* commit '0b20a705babac184754e41919ddbc3b9a3937933':
  set max_events_per_sec to 55
2011-03-04 01:01:39 -08:00
Christopher Tate
380be914ff am 0474407e: am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1
* commit '0474407e5d99d6e78451c66703d2934adca0cec4':
  Don't spuriously time out restore sessions
2011-03-04 01:01:26 -08:00