Commit Graph

53103 Commits

Author SHA1 Message Date
Mike Lockwood
5787a2d5b4 USB connected notification and temporary USB options dialog
This change adds a notification when USB is connected.
Selecting the notification brings up a dialog to allow switching between
MTP and PTP modes, and also allows mounting a CD image for installing AFT.
The UI design is not final - this is a temporary implementation of the UI.

Change-Id: Idd678537aba595fd4cb183ea755bf437f372d826
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 19:49:05 -04:00
Mike Lockwood
ecedfdc779 MountService: Use UsbManager to monitor USB state for mass storage
Change-Id: I50c15c1dc8a1ee4f41cac7de8df9529ff5da1053
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 19:49:05 -04:00
Mike Lockwood
02e4569b5f USB: Support for new USB gadget drivers
Change-Id: Id08df50acb873a94f4765a991ee6a6f5b898ddf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 19:49:05 -04:00
Mike Lockwood
5d27b7a29b Add string resource for CD installer image path
Change-Id: I50eb2d0213f0547e88e9a20ab926726e781b0c0b
2011-06-17 19:49:04 -04:00
David Brown
c4887faa4a Merge "Fix permissions check in IccSmsInterfaceManager.sendText()" 2011-06-17 13:15:24 -07:00
Daisuke Miyakawa
18cc57fb93 Merge "Add API for auto-complete ranking improvement." 2011-06-17 13:10:40 -07:00
John Reck
79e16da930 Merge "Make textZoom public" 2011-06-17 13:05:56 -07:00
Daniel Sandler
d3cdbf0a4f Merge "ICS updates to notification layouts." 2011-06-17 12:43:21 -07:00
John Reck
caeb120170 Make textZoom public
Deprecate textSize (enum based) in favor of textZoom (percentage based)

Change-Id: Ibb4c25b461bcb57e5c2cdf709485d255db20a43c
2011-06-17 11:50:15 -07:00
Jeff Sharkey
5bfa752f71 Merge "Avoid clobbering UID stats when not yet loaded." 2011-06-17 11:28:31 -07:00
Philip Milne
395eef3bb6 Merge "Change includeMarginsInAlignment flag to aligmentMode property." 2011-06-17 11:22:36 -07:00
Jeff Sharkey
af8339374f Avoid clobbering UID stats when not yet loaded.
Bug: 4690822
Change-Id: Ia6c9e8f89e89739cf3380c4b98b9da6f52db48fa
2011-06-17 11:18:27 -07:00
RoboErik
59dab49cb8 hide CalendarMetaDataColumns
Change-Id: I248b608cfdac51b8fe2ccc36fa1701c3f1915849
2011-06-17 11:09:36 -07:00
John Reck
08664e815c Merge "Add textZoom setting" 2011-06-17 10:51:23 -07:00
Jamie Gennis
54ed610790 Merge "SurfaceTexture: enable a test that now passes." 2011-06-17 10:45:15 -07:00
Jamie Gennis
ce14a04b2c Merge "SurfaceTexture: enable a test that is now passing." 2011-06-17 10:45:01 -07:00
Daniel Sandler
ebce0115e2 ICS updates to notification layouts.
Of note:

1. There is no "X" (veto) button anymore. (Well, there is,
   but it's offscreen so it should still be available to
   assistive devices.) Users can use "Clear all" or the new
   swipe-to-veto gesture to clear notifications.

2. As a consequence of #1, your layout goes all the way to
   the right edge of the notifications panel again. Enjoy
   the extra space!

3. The numeric bubble in the notification icon is now capped
   at "999+" like it is in the expanded notification view.
   (Note that this involves a couple of new public framework
   resources: one to indicate the number beyond which the
   substitution string will be used, and one specifying a
   localizable substitution string.)

Bug: 4651514
Bug: 4686329
Bug: 4501990
Change-Id: I0e6bdb6aec4fe5bfc927eb1aba955d444a9414ec
2011-06-17 13:28:56 -04:00
Irfan Sheriff
f2288c960c Merge "Fix IP address cleanup on network disconnect" 2011-06-17 10:09:36 -07:00
Irfan Sheriff
f5600618df Fix IP address cleanup on network disconnect
We used to bring down the interface on network disconnect
which would in turn clean up all the IP addresses.

The interface bringup/shutdown is now handled by wpa_supplicant.
Add netd interface for clearing all IP addresses

Bug: 4676254
Change-Id: I7e24c0ab2e4a412b8d61e9c33ce028966913aaf6
2011-06-17 10:03:13 -07:00
John Reck
ff56bcde85 Add textZoom setting
Replaces the limited textSize (enum) with a more flexible
 textZoom (percent)

Change-Id: I443757841910f5cbe1c9078166361d1686005f14
2011-06-17 09:39:39 -07:00
Daniel Sandler
de47f1c358 Merge "Make the Notify Builder test usable on phones." 2011-06-17 05:58:59 -07:00
David Brown
e510fa4c0b Fix permissions check in IccSmsInterfaceManager.sendText()
In android.internal.telephony.IccSmsInterfaceManager, we currently use
enforceCallingPermission() rather than enforceCallingOrSelfPermission()
to enforce the SEND_SMS permission.

The difference is that enforceCallingPermission() will ALWAYS throw a
SecurityException if you're not handling an IPC, i.e. if the request is
from the same process as the telephony framework.

In other words, the current code prevents the phone app from ever using
SmsManager.sendTextMessage() :-(

This change fixes IccSmsInterfaceManager.sendText() to use
enforceCallingOrSelfPermission(), and I confirmed I can now send SMSes
from the phone app.

NOTE there are a bunch of other uses of enforceCallingPermission() in the
telephony framework (all SMS-related) that we probably want to fix too,
although I'm fixing just this one for now since it's blocking a hi-pri
phone UI feature.  I opened bug 4686733 to cover the rest of the cleanup,
though.

Bug: 4686733
Change-Id: Iaffcf62c54493fa4961fb20894c974697f26e3a7
2011-06-17 01:36:20 -07:00
Wu-cheng Li
25b93adeae Merge "Mention device policay manager in Camera.open javadoc." 2011-06-17 00:18:21 -07:00
Wu-cheng Li
facc8ce116 Mention device policay manager in Camera.open javadoc.
bug:4185309
Change-Id: I733654a0be1953851dac7686c9c38e7af8f1d73a
2011-06-17 13:11:03 +08:00
Irfan Sheriff
84a1b9e168 Merge "Fix network state handling" 2011-06-16 20:54:04 -07:00
Philip Milne
1e54825135 Change includeMarginsInAlignment flag to aligmentMode property.
Also:

. Change getInteger() to getInt().
. Conditionally compile, Paint() allocation and initialization.
. Correct spelling mistake in javadoc.

Change-Id: I00438a717e635a3917c5324f56063dce2e6041e8
2011-06-16 20:47:29 -07:00
Chia-chi Yeh
4d4faf9e91 Merge "VPN: make the file descriptor non-blocking by default." 2011-06-16 19:03:57 -07:00
Chia-chi Yeh
84bf7390ea VPN: make the file descriptor non-blocking by default.
Change-Id: I89899b2b6a8ac64a4a052ffd501cc0221fab3ffe
2011-06-16 19:01:28 -07:00
Jim Miller
452eec33d6 Merge "Update GridLayout constructors to properly handle DEBUG=true" 2011-06-16 18:32:44 -07:00
Adam Powell
05c06de73c Merge "Dialog-o-rama!" 2011-06-16 18:31:18 -07:00
Adam Powell
a93347a62e Dialog-o-rama!
New styling for Holo dialogs. Now 76% easier for apps to create
dialog-based layouts! (Less tricky padding and margin rules)

Cancelable AlertDialogs now are canceled when the user touches
outside.

Dialogs in landscape mode will try not to fill the width of the
screen.

Change-Id: I621b5a19780883ee703a8492510451b480a0b8cc
2011-06-16 18:20:54 -07:00
Mathias Agopian
b56c8ac8b7 am 3b916233: (-s ours) am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '3b916233cbbbcc5bbc703213af5e647910956cbc':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
2011-06-16 18:18:47 -07:00
Mathias Agopian
3b916233cb am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '48294b0d9388cff632f0e6ae5220305d342c76fb':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
2011-06-16 18:15:19 -07:00
Mathias Agopian
48294b0d93 am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit 'e7d3ee9d81de13e992c7d063ca472d480956b0c6':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
2011-06-16 18:09:56 -07:00
Jim Miller
c655ba5e46 Update GridLayout constructors to properly handle DEBUG=true
This fixes a case where the grid layout debugging wasn't showing.

Change-Id: I28b2754d2d824731e24126300bc501ae2e379ee4
2011-06-16 17:33:20 -07:00
Mathias Agopian
e7d3ee9d81 Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Also revert all dependent changes:
This reverts commit 8e18668d14.
This reverts commit 69b4587bfb.
This reverts commit a9c9a4baf2.
This reverts commit 2c0042b666.
This reverts commit f6c8206735.
This reverts commit 24855c0917.

Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
2011-06-16 17:22:28 -07:00
John Wang
1c4438243d am e21217af: (-s ours) am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'e21217af6480c45212517a68b2b6e583c4dc27c9':
  Revert "Do not merge. Return null id for Non-phone device."
2011-06-16 17:20:06 -07:00
John Wang
e21217af64 am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
  Revert "Do not merge. Return null id for Non-phone device."
2011-06-16 17:14:28 -07:00
Maarten Hooft
3a3efe7563 am 769bf5d5: am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '769bf5d59ef1b6a9bce9d64d9761def735d6af65':
  Import revised Croatian translations.
2011-06-16 17:05:19 -07:00
John Wang
c6b32054c6 am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
  Revert "Do not merge. Return null id for Non-phone device."
2011-06-16 16:50:05 -07:00
John Wang
c826f92e6f Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 2011-06-16 16:47:18 -07:00
Dianne Hackborn
46d6bcfb95 Merge "resolved conflicts for merge of 872a1e79 to master" 2011-06-16 16:38:07 -07:00
John Wang
fe9aa2706f Revert "Do not merge. Return null id for Non-phone device."
This reverts commit cea03df201
2011-06-16 16:30:02 -07:00
Fabrice Di Meglio
9171bf3892 Merge "Update BiDiTest app for testing View padding" 2011-06-16 16:20:51 -07:00
Fabrice Di Meglio
b07124082e Update BiDiTest app for testing View padding
Change-Id: I7b956bd1d16cc4d27f33595f09f14f5d4e17e469
2011-06-16 16:19:59 -07:00
Svetoslav Ganov
63eeff7427 Merge "Accessiiblity in right state upon connection of a test agent." 2011-06-16 16:15:20 -07:00
Romain Guy
bec9be2f51 Merge "Prevent TweetDeck from crashing." 2011-06-16 16:14:06 -07:00
Romain Guy
5d5d1ff2d5 Prevent TweetDeck from crashing.
Change-Id: I964d9152010060c3a2698cdb6c22ac21da1af8b0
2011-06-16 16:13:01 -07:00
Svetoslav Ganov
9dc98e3d17 Accessiiblity in right state upon connection of a test agent.
1. Enabling accessibility and disabling all enabled
   accessibility service when a test client connects
   the the AccessibilityManagerService.

Change-Id: I2f40cccaa0035ac1454d8c5ac84678c1542a0229
2011-06-16 16:12:36 -07:00
Dianne Hackborn
a7f88508d3 resolved conflicts for merge of 872a1e79 to master
Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74
2011-06-16 16:01:27 -07:00