Jeff Sharkey
78ae81efa9
Merge "First pass at NetworkPolicy and activity tracking."
2011-05-17 12:27:01 -07:00
Dianne Hackborn
0305e354e1
This API change is now part of MR2.
...
Change-Id: I242e66fb9c46d48244942298361f408062fb05c4
2011-05-17 10:49:53 -07:00
Narayan Kamath
b956f37e37
Pass synthesis request params through to the TTS service.
...
Change-Id: I1ffd617d8dfa0814382643e3cf6b3ab7417c742a
2011-05-17 09:47:59 +01:00
Dianne Hackborn
9d31154d0b
am b68c768d: am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit 'b68c768ddb57407bc253230c677056329c9e4bae':
Add new command line option to change global screen size.
2011-05-16 21:39:47 -07:00
Dianne Hackborn
b68c768ddb
am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit '417448369c170a34d76c477aa19c5293e3caa1df':
Add new command line option to change global screen size.
2011-05-16 21:29:32 -07:00
Dianne Hackborn
417448369c
am 7916ac65: Add new command line option to change global screen size.
...
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
2011-05-16 21:21:24 -07:00
Dianne Hackborn
7916ac65dc
Add new command line option to change global screen size.
...
For example:
adb shell am display-size 1024x600
Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
2011-05-16 20:55:41 -07:00
Fabrice Di Meglio
b5dde704cd
Merge "Adding horizontalDirection public attribute for View."
2011-05-16 15:13:10 -07:00
Cibu Johny
7632cb9be5
Adding horizontalDirection public attribute for View.
...
Change-Id: Ic8a03447252e4e155c3ee874b1d8c8ac0bc9f7f5
2011-05-16 15:08:27 -07:00
Dianne Hackborn
60e13114eb
am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '1d340a3c24913d8750900355cd92ef5742eea11f':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:16:45 -07:00
Dianne Hackborn
1d340a3c24
am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:13:00 -07:00
Dianne Hackborn
0eac092766
Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
2011-05-16 13:10:23 -07:00
Dianne Hackborn
68066c2f38
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
...
Not yet working, so turned off.
Also fix a bug where the display size configuration became inconsistent
after a configuration change -- we now figure out everything about the
display size when computing a new configuration.
Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
2011-05-16 13:08:07 -07:00
Dianne Hackborn
63446167b9
am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
...
* commit 'fddd927fb78bb206287203f4f447a416b525115a':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
2011-05-16 13:04:49 -07:00
Dianne Hackborn
fddd927fb7
am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
...
* commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
2011-05-16 13:02:57 -07:00
Dianne Hackborn
f97ed77197
am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
...
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
DO NOT MERGE. Integrate from master: Rework display size access.
2011-05-16 13:01:38 -07:00
Dianne Hackborn
9d0f2c6d97
Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
2011-05-16 13:01:07 -07:00
Dianne Hackborn
29735689ce
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
...
Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a
2011-05-16 12:57:38 -07:00
Dianne Hackborn
d90a2c4d44
am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
...
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
DO NOT MERGE. Integrate from master: Rework display size access.
2011-05-16 12:57:00 -07:00
Dianne Hackborn
1e662c3294
Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
2011-05-16 12:54:22 -07:00
Mike Lockwood
8fa5b03c1b
resolved conflicts for merge of fc4a3d37 to master
...
Change-Id: I40f603ba9330c3e882f4d58398095f4094725b21
2011-05-16 15:49:53 -04:00
Mike Lockwood
fc4a3d37ef
am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
...
* commit 'b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
StorageManager: Clean up and generalize storage configuration resources
2011-05-16 12:38:36 -07:00
Mike Lockwood
b822d2464d
am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
...
* commit '0a93d875527c52183080b63a0b19d567856952af':
StorageManager: Clean up and generalize storage configuration resources
2011-05-16 12:36:29 -07:00
Mike Lockwood
0a93d87552
Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
2011-05-16 12:34:02 -07:00
Dianne Hackborn
ac8dea12c1
DO NOT MERGE. Integrate from master: Rework display size access.
...
Applications now get the display size from the window manager. No
behavior should be changed yet, this is just prep for some real
changes.
Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
2011-05-16 11:58:27 -07:00
Romain Guy
51d6eb7dcf
Fix crash when using a SimpleCursorAdapter initialized with a null Cursor.
...
Change-Id: Ia7d078db8ab941c830663e6af7cbb07d7bad24a8
2011-05-16 11:55:08 -07:00
Romain Guy
0c0b768e15
Fix NPE when calling PopupWindow's default constructor.
...
Change-Id: I5317b052236d758fd3b9055c9940fbb10ec7b123
2011-05-16 11:54:09 -07:00
Romain Guy
02739a8eec
Fix javadoc issues
...
Change-Id: Ife66a8664955ac1a79b6ffd0080000c820f24632
2011-05-16 11:53:31 -07:00
Mike Lockwood
2f6a388553
StorageManager: Clean up and generalize storage configuration resources
...
Replace config_emulateExternalStorage, config_externalStorageRemovable,
config_externalStoragePaths, config_externalStorageDescriptions and
config_mtpReserveSpaceMegabytes resources with an XML resource file
to describe the external storages that are available.
Add android.os.storage.StorageVolume class
StorageManager.getVolumeList() now returns an array of StorageVolume
Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-05-16 14:29:23 -04:00
Gilles Debunne
056054f7c5
Merge "Links in Environment javadoc"
2011-05-16 11:14:41 -07:00
Dianne Hackborn
fbdf9df053
am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
...
* commit '2a20583a5f436d66ab73cd6c0fdc73e59a3cecad':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
2011-05-16 11:09:31 -07:00
Dianne Hackborn
2a20583a5f
am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
...
* commit '700ab1c75862babba90f54e02bdc877becd4f4fc':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
2011-05-16 11:06:28 -07:00
Dianne Hackborn
24df0757f8
am ed9321ab: am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
* commit 'ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:41:04 -07:00
Dianne Hackborn
ed9321ab5d
am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
* commit 'f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
2011-05-13 18:39:01 -07:00
Dianne Hackborn
9a84983a9f
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
...
Activity manager now does all dump requests into apps
asynchronously, so it can nicely timeout if there is an
app problem. Also lots of general cleanup of the am
dump output.
Change-Id: I99447b87f77a701af52aeca984d93dfe931f065d
2011-05-13 18:38:19 -07:00
Dianne Hackborn
f9dd34f4d3
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
...
And clean up some documentation.
Change-Id: I8f06e2fc3bb6c552581b64657e82ba690d524232
2011-05-13 18:31:04 -07:00
Jeff Sharkey
43be174888
Add Socket tagging for granular data accounting.
...
Introduces public API to apply "tags" to track data traffic originating
from the current thread. (Under the hood, the tags are maintained and
applied in BlockGuard.) Also adds tag/untag methods for developers who
maintain their own Socket pools.
Change-Id: Ic2dd3155559a93a7b613c7853748d4c44fb3a39e
2011-05-13 18:19:00 -07:00
Dianne Hackborn
ba4990c77c
am 71da3207: am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
...
* commit '71da32074ce729fe170de2d6c348b110fb6625cc':
Fix a bug where an action bar could be created when it should not be.
2011-05-13 16:32:00 -07:00
Dianne Hackborn
71da32074c
am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
...
* commit '7d87c37b031616259d1db6a78ecb1ff20ee5ff5c':
Fix a bug where an action bar could be created when it should not be.
2011-05-13 16:29:40 -07:00
Dianne Hackborn
7d87c37b03
am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
...
* commit '6121f06ed5847d1edd22b23c3b28bf3b3e3af602':
Fix a bug where an action bar could be created when it should not be.
2011-05-13 16:26:44 -07:00
Dianne Hackborn
6121f06ed5
Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
2011-05-13 16:24:32 -07:00
Jeff Sharkey
d5cdd597b8
First pass at NetworkPolicy and activity tracking.
...
New system service that maintains low-level network policy rules and
collects statistics to drive those rules. Will eventually connect to
netfilter kernel module through NetworkManagementService and "netd".
Begin tracking foreground activities in ActivityManagerService, which
is updated as part of OOM adjustment. Eventually a network policy of
POLICY_REJECT_BACKGROUND will reject network traffic from background
processes.
Change-Id: I5ffbbaee1b9628e9c3eff6b9cb2145fc5316e64d
2011-05-13 16:20:21 -07:00
Eric Fischer
aa126171ae
Fix the build by removing @Override within javadoc comments.
...
Change-Id: I984cc6224185ab84e904bfc89eae80d567fcb59b
2011-05-13 16:08:24 -07:00
Dianne Hackborn
28a8bce691
am 6824c135: am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
...
* commit '6824c135fe9639c74f38f125d678c20065c3347c':
DO NOT MERGE. Integrate fragment work from master
2011-05-13 15:45:23 -07:00
Dianne Hackborn
6824c135fe
am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
...
* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
DO NOT MERGE. Integrate fragment work from master
2011-05-13 15:36:48 -07:00
Romain Guy
8bd6d36c68
Merge "Remove useless code."
2011-05-13 14:50:06 -07:00
Romain Guy
4c8ed71cc7
Remove useless code.
...
Change-Id: Ic2418438235e1fbcb8ccfece9c74c54fc46229df
2011-05-13 14:48:28 -07:00
Svetoslav Ganov
73162196e7
Merge "Factored out the Accessibility vertical initialization."
2011-05-13 14:19:17 -07:00
Svetoslav Ganov
30401328c1
Factored out the Accessibility vertical initialization.
...
1. Accessibility events were filled with data in
dispatchPopulateAccessibilityEvent and
onPopulateAccessibilityEvent. These events have
two axis of population 1) up the class
hierarchy to populate information for the event
source; 2) down the view hierarchy to populated
all the text contained in the source including
its descendants. These two axis of population
were done in on population pass now the populating
the source properties happens in initializeAccessiblityEvent
and the text in onPopulateAccessibilityEvent which
is called from dispatchPopulateAccessiblityEvent.
2. Removed the string description from events fired from
CompoundButton since the event has isChecked()
property and it is responsibility of the clients
to decide what utterrance to use and if to use such
for announcing the checked state.
Change-Id: I5d7f75cf8a87a7a4b3bb7b311e8e642ec9a0faa5
2011-05-13 14:18:37 -07:00
Adam Powell
a593d9852f
Fix a bug where an action bar could be created when it should not be.
...
Change-Id: I9ca1038accdb6d0a539750ed8ab068a41612f6ae
2011-05-13 14:09:54 -07:00