20500 Commits

Author SHA1 Message Date
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
094c9900de am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
* commit '2c3ed82600af117e791a087330a198fe90d298b7':
  Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:48:13 -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
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
5d534f288d am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit 'ea44c7c71431adbce348cf9ef3f22d9561bb7fc1':
  Pass the auto login header information to the app.
2011-03-09 05:08:15 -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
Bjorn Bringert
6a5ecc0900 Merge "Exception handling clean-up in TextToSpeech.java" 2011-03-09 04:38:08 -08:00
Kristian Monsen
39dc4b1e14 am b4ca8b76: am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1
* commit 'b4ca8b7696ea8559fced8bcdf36e11ed28785c7c':
  Fix for bug 3469242 Turn of extra debugging before shipping
2011-03-09 04:34:31 -08:00
Kristian Monsen
b4ca8b7696 am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1
* commit '9e697ee9fc9dcc21348d799e1e0bc83dd3abdb18':
  Fix for bug 3469242 Turn of extra debugging before shipping
2011-03-09 04:32:28 -08:00
Kristian Monsen
9e697ee9fc Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 2011-03-09 04:29:45 -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
093cf07f3c am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '9e8e4ea0a839b561d329758cddbfd0f7ea23f593':
  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:54:28 -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
Adam Powell
27230862b1 am 529eb76b: am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
* commit '529eb76b8add903c67ecf0178b6b4603edd64ebb':
  Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:28:29 -08:00
Adam Powell
529eb76b8a am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
* commit '12230eaa5f446cb22032d6645074a1aaca146df9':
  Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:25:10 -08:00
Adam Powell
12230eaa5f Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1 2011-03-09 00:22:53 -08:00
Adam Powell
2b0952b197 Fix bug 4065021 - Adjust spacing of the "home" action bar item to be
consistent with the "up" indicator

Make sure that the "home" affordance in the action bar always occupies
the same amount of space regardless of whether or not the "up"
indicator is visible. This means centering the application icon/logo
in the remaining space after the "up" indicator has been added.

Change-Id: I3c81cfe8255546d4dd676af913895713baba4f13
2011-03-09 00:17:42 -08:00
Romain Guy
3d2b75ac0f am 3391435a: am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1
* commit '3391435afd7fa69e12cde17754e1d1f98f9d77e9':
  Prevents NPE when a View was detached Bug #4068284
2011-03-08 23:56:26 -08:00
Adam Powell
4fdda70026 am 4763777e: am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
* commit '4763777ebfa9d0d40ea7d117a351eaf96c5ac816':
  Bug 3509417 - Refine touch event serialization
2011-03-08 23:53:40 -08:00
Nicolas Roard
f610c421ea am acafb26d: am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1
* commit 'acafb26d34963807fc8f4c1a46763c51821d194e':
  Partial invalidation of the browser textures
2011-03-08 23:53:26 -08:00
Romain Guy
3391435afd am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1
* commit '812dba1fcaa1a374124c2fe0694c1b4f21e3dea9':
  Prevents NPE when a View was detached Bug #4068284
2011-03-08 23:53:06 -08:00
Romain Guy
812dba1fca Merge "Prevents NPE when a View was detached Bug #4068284" into honeycomb-mr1 2011-03-08 23:51:02 -08:00
Adam Powell
4763777ebf am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
* commit '1250c94b50a3322e44c8ded7ab15bd6da9cc82a7':
  Bug 3509417 - Refine touch event serialization
2011-03-08 20:02:44 -08:00
Adam Powell
1250c94b50 Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1 2011-03-08 20:00:25 -08:00
Carl Shapiro
9b8c5f6143 Merge "Remove unused JNI global references." 2011-03-08 19:49:47 -08:00
Nicolas Roard
acafb26d34 am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1
* commit 'f986d496c56fc8ae44b03f982e3e1ed437cdb996':
  Partial invalidation of the browser textures
2011-03-08 19:06:17 -08:00
Nicolas Roard
f986d496c5 Merge "Partial invalidation of the browser textures" into honeycomb-mr1 2011-03-08 19:02:33 -08:00
Amith Yamasani
ad8479ddcc am f9b9bd53: am 1f111f11: Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
* commit 'f9b9bd538d846d8931eb9cc4f05d51f4d19a318d':
  Searchview layout cleanup. Some more tweaks required for Market.
2011-03-08 18:43:37 -08:00
Justin Ho
1464d1d98a am 6f761209: am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1
* commit '6f7612094a568b5ad477440bb865b6c673a476b2':
  Updated text cursor assets
2011-03-08 18:42:04 -08:00
Adam Cohen
00b9ea7daf am d8bf8911: am f10615d8: Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1
* commit 'd8bf89116b30a13ea48e3b057897ad83058095b1':
  Fixing inconsistency between invalidate region and draw region
2011-03-08 18:41:29 -08:00
Andy Stadler
a90ad2ced2 am bdec2e56: am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
* commit 'bdec2e565bd1f086d65a956db432bf54cdf78f6d':
  Clarify rules about encryption of emulated storage.
2011-03-08 18:41:20 -08:00
Romain Guy
cf0f9a0b62 am 1e415023: am 3d7796c1: Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1
* commit '1e415023ee4c8aef2bfcb51e4293e62eb32eb23f':
  Correctly handle opaque fading views Bug #3475554
2011-03-08 18:41:15 -08:00
Huahui Wu
388b0768e1 am f7a3169f: am 8496ddc5: Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1
* commit 'f7a3169fd85db08538809d17d802795ea4e62b0c':
  b/3307761 Tuning two fingers pan.
2011-03-08 18:40:46 -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
Romain Guy
e294d41593 Prevents NPE when a View was detached
Bug #4068284

Change-Id: Ied1c9b8d32a3e9957c6b165642ba40bbdaf35d53
2011-03-08 17:35:10 -08:00
Amith Yamasani
f9b9bd538d am 1f111f11: Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
* commit '1f111f11721d5d550f45135ba193c465e59a635b':
  Searchview layout cleanup. Some more tweaks required for Market.
2011-03-08 16:36:47 -08:00
Amith Yamasani
1f111f1172 Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1 2011-03-08 16:34:11 -08:00
Amith Yamasani
79f7430bf9 Searchview layout cleanup. Some more tweaks required for Market.
Bug: 3321263

Submit area should be visible when the field has focus, irrespective of text content.
Make sure that the fields get highlighted when focused.
Also fix an issue with hint not being applied from the SearchableInfo.
Bug: 3470348

Change-Id: If399d9551f89312c19485e249043f5823a862499
2011-03-08 16:08:49 -08:00
Adam Powell
ae9d2640f3 Bug 3509417 - Refine touch event serialization
Fix an issue with single-touch events handled by webkit.

Change-Id: Ief4e9ec91cda7dd3940241c684d0907cb8c9890f
2011-03-08 16:01:37 -08:00
Justin Ho
6f7612094a am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1
* commit '7b27dc1201b10e40bcd9fbc73482640ccc15a6bf':
  Updated text cursor assets
2011-03-08 15:35:47 -08:00
Justin Ho
7b27dc1201 Merge "Updated text cursor assets" into honeycomb-mr1 2011-03-08 15:34:15 -08:00
Justin Ho
b0ac8e7986 Updated text cursor assets
Change-Id: Ib3f7fc4f835957c07b6c3b045cb5b3131034dde3
2011-03-08 15:24:58 -08:00
Adam Cohen
d8bf89116b am f10615d8: Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1
* commit 'f10615d8d86f4324bf5f6b5a2eb2874cc2b5ef3d':
  Fixing inconsistency between invalidate region and draw region
2011-03-08 15:02:34 -08:00
Adam Cohen
f10615d8d8 Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1 2011-03-08 14:59:51 -08:00
Andy Stadler
bdec2e565b am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
* commit 'c9e598995db68cf97dc3ed0fc527a35e2d966afd':
  Clarify rules about encryption of emulated storage.
2011-03-08 14:53:06 -08:00
Romain Guy
1e415023ee am 3d7796c1: Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1
* commit '3d7796c17ffae7892d1987053c3b6698697cffa2':
  Correctly handle opaque fading views Bug #3475554
2011-03-08 14:53:01 -08:00
Andy Stadler
c9e598995d Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1 2011-03-08 14:50:32 -08:00
Romain Guy
3d7796c17f Merge "Correctly handle opaque fading views Bug #3475554" into honeycomb-mr1 2011-03-08 14:49:54 -08:00
Huahui Wu
f7a3169fd8 am 8496ddc5: Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1
* commit '8496ddc536eb917c813b7928f174c828d2275ada':
  b/3307761 Tuning two fingers pan.
2011-03-08 14:44:39 -08:00
Huahui Wu
8496ddc536 Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1 2011-03-08 14:40:50 -08:00