Kenny Root
d022c23aed
Merge "Revise free space checks for package installs"
2011-03-15 14:48:56 -07:00
Mike Lockwood
7896f1bd55
am c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
...
* commit 'c9b82ebb97411cf4a8494dc83f57039bb77937c5':
USB Manager string clean up:
2011-03-15 13:49:14 -07:00
Mike Lockwood
c9b82ebb97
am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
...
* commit '3b7871c242bea5834c657c25fbb89c382566f66f':
USB Manager string clean up:
2011-03-15 13:42:44 -07:00
Mike Lockwood
ad5f83e91b
USB Manager string clean up:
...
- Use "Cancel" instead of "Ignore"
- Customize the text for the "always use" checkbox for devices and accessories
- Clean up strings for AccessoryChat test program
Bug: 4074719
Change-Id: Ideec838e4c1f1a82ef4ae411c9124417ffb63165
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 16:23:40 -04:00
Eric Fischer
b2389eaada
Merge "Import revised translations."
2011-03-15 12:00:49 -07:00
Eric Fischer
0d1d2a7a2c
Import revised translations.
...
Change-Id: Ic97284d3867608cbc0f018eb2472affbc783b675
2011-03-15 10:37:23 -07:00
Mike Lockwood
862481c299
am 1c4e4fcc: am 38bc9f07: am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
...
* commit '1c4e4fcc473f47bda351cec3e48652f5392e6498':
Fix broadcast receiver leak in UsbConfirmActivity
2011-03-14 17:51:44 -07:00
Mike Lockwood
38bc9f0701
am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
...
* commit 'f4c9c140a204c83c6185b9ada0e33e740ecf779b':
Fix broadcast receiver leak in UsbConfirmActivity
2011-03-14 17:45:29 -07:00
Kenny Root
62e1b4e9d4
Revise free space checks for package installs
...
Change-Id: Ie72bbab77aa89a50ec096edc1f471eab74829e67
2011-03-14 17:18:24 -07:00
Mike Lockwood
8f6dce44e3
Fix broadcast receiver leak in UsbConfirmActivity
...
Change-Id: Ie1db70d9a57f16f192178583871994467f50a636
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 20:17:13 -04:00
Eric Fischer
9f7b4ba69c
Import revised translations. DO NOT MERGE
...
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
2011-03-14 14:31:58 -07:00
Iliyan Malchev
3070af0882
frameworks/base: remove LOCAL_PRELINK_MODULE
...
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 14:25:59 -07:00
Eric Fischer
175121a513
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-14 14:17:01 -07:00
Eric Fischer
7b31d5c84f
Import revised translations. DO NOT MERGE
...
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
2011-03-14 14:06:03 -07:00
Wink Saville
c15cf6353e
Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE
2011-03-14 13:40:58 -07:00
Wink Saville
9d7d62801d
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
...
This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.
Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
2011-03-14 12:25:04 -07:00
Irfan Sheriff
fd10d5cf56
am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
...
* commit 'fb8971106e5ea105e176c995c1ff3b4fbe630710':
Backup and restore IP and proxy settings
2011-03-14 12:10:27 -07:00
Irfan Sheriff
e21110f8b1
Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
2011-03-14 11:48:35 -07:00
Mike Lockwood
0c5820ad8e
am 151c74b3: am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
...
* commit '151c74b3c679a1799d01f210a2a3f4a658154320':
Add a dialog to ask user to start an application for a USB device or accessory
2011-03-14 07:10:07 -07:00
Mike Lockwood
bce6f8f249
Add a dialog to ask user to start an application for a USB device or accessory
...
This is used when there is only one application available and the user has
not chosen to start it by default.
If more than one application is available we continue to use UsbResolverActivity
Bug: 4074719
Change-Id: Id61f2ccc6de5b9ac70fb4670006ff1fee2028d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-13 19:18:08 -04: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
Mike Lockwood
364903bac6
Merge "Support for USB accessory URIs" into honeycomb-mr1
2011-03-11 05:56:50 -08:00
Justin Ho
31933a7a1d
am f5c2d350: am f1093dfd: Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
...
* commit 'f5c2d35059b482a2fc5e1284663648556c9a0596':
Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF
2011-03-10 22:36:07 -08:00
Justin Ho
f1093dfd7b
Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
2011-03-10 22:31:29 -08:00
Justin Ho
92b168193f
am cf99638b: am 57162cdc: Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
...
* commit 'cf99638b6b262197cdfb317582f5d8c93a94e649':
Wire up the data activity reporting on wifi icon in status bar.
2011-03-10 22:27:02 -08:00
Justin Ho
48a412bded
Updated cellular data indicators with transmission signals AGAIN
...
Bug: #6699FF
Change-Id: Idfc1c43e3fb2df12665bcc3ea18ae7b9f6dfbe9e
2011-03-10 22:26:34 -08:00
Justin Ho
57162cdcde
Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
2011-03-10 22:22:57 -08:00
Joe Onorato
f32621aded
Wire up the data activity reporting on wifi icon in status bar.
...
Bug: 3412258 and #6699FF
Change-Id: I11142f1cd5a2a60045b2a1fea371b2ead2aa81b4
2011-03-10 22:21:50 -08:00
Justin Ho
d2ca9fcd1b
am f333baa0: am dacf0d02: Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
...
* commit 'f333baa015407982ae76e63331b6d0c200c825c5':
Updated cellular data indicators with transmission signals Bug: #6699FF
2011-03-10 21:44:20 -08:00
Justin Ho
dacf0d022f
Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
2011-03-10 21:39:24 -08:00
Justin Ho
f269fe3b22
Updated cellular data indicators with transmission signals
...
Bug: #6699FF
Change-Id: I86a4d31f24112daeb20f9edd3f06a1eb0ff4c846
2011-03-10 21:37:18 -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
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
Eric Fischer
c66ef5ab33
Import revised translations. DO NOT MERGE
...
Change-Id: I0ee1d6152852c0cb085cc073ed0684dcc03d6ba7
2011-03-10 11:23:57 -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
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
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
Mike Lockwood
d591357524
Close USB dialogs if their corresponding accessory or device has disconnected
...
BUG: 4060065
Change-Id: Ib517e5e4a5422f9f0c8fca601308cecf7743c5d1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-08 22:47:08 -05:00
Jim Miller
9b33ab8f45
am 979bd339: am ccdeb60c: Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1
...
* commit '979bd339b56633803700ab98e77fc12b479c0fce':
Fix 4025690,4027061: Minor tweaks to recent applications layouts
2011-03-08 18:41:10 -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
Jim Miller
ccdeb60cb6
Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1
2011-03-08 14:49:47 -08:00
Jim Miller
c43f6c58ce
Fix 4025690,4027061: Minor tweaks to recent applications layouts
...
This makes these changes:
- Reduce fade area from 30 pixels to 20 pixels at top and bottom of recents view
when scrollable
- Shift application icon up and to the right in all recent items.
Change-Id: If510b63a92d6396ffb087b12f4ddc8847c95f3d7
2011-03-07 18:49:43 -08:00
Daniel Sandler
2697884b39
am a1a998af: am ec1f1f4c: Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* commit 'a1a998af3b47ecec4ee3f65eda723b7cb50e7699':
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:54:36 -08:00
Daniel Sandler
ec1f1f4cfc
Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* changes:
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:47:13 -08:00
Justin Ho
c377dc8aba
am b2b94050: am 0b51f574: Merge "Updated stat notification icons" into honeycomb-mr1
...
* commit 'b2b94050df924d3fb3cfe31f01ccd93c3d14ab66':
Updated stat notification icons
2011-03-04 17:15:13 -08:00
Justin Ho
7962302fe6
am ac58f626: am abd481f6: Merge "Updated clock notification panel background (pressed state)" into honeycomb-mr1
...
* commit 'ac58f62665be4f3211f6efd2528c50812ac941ef':
Updated clock notification panel background (pressed state)
2011-03-04 17:15:10 -08:00
Justin Ho
0b51f57479
Merge "Updated stat notification icons" into honeycomb-mr1
2011-03-04 15:40:00 -08:00
Justin Ho
d836dce27b
Updated stat notification icons
...
Change-Id: I5084007427928c96de1bc64add0f1069d50ffaec
2011-03-04 15:31:56 -08:00