Jesse Wilson
dbd32ae3ae
am 2ff591ff: Merge "Format NaN and Infinity as Doclava expects."
...
* commit '2ff591ffb6cc05e80fb5f353c4b34c7794070c4f':
Format NaN and Infinity as Doclava expects.
2011-09-28 14:20:50 -07:00
Jesse Wilson
9c5cacc71a
Format NaN and Infinity as Doclava expects.
...
Change-Id: I500e049132b3254e3b78e08c1875e0dc451b70b6
2011-09-28 17:04:52 -04:00
Mike Lockwood
6010dafe06
Add SerialPort.sendBreak()
...
Change-Id: If25ba7724cf69489f2b04fc995baa9c164b5ea58
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-23 11:43:42 -04:00
Jaikumar Ganesh
a42a8038dd
am a0c7ec2b: am 90fb9aa9: Merge "Make Bluetooth Health constant public." into ics-factoryrom
...
* commit 'a0c7ec2b5a6940c504ea5af0db46ebc0ec091155':
Make Bluetooth Health constant public.
2011-09-21 19:11:02 -07:00
Kenny Root
d5ebd5694f
am 0d3647dc: am 9c711282: Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom
...
* commit '0d3647dc00849872ec5e18cce8ffe0e6ae02dd47':
Unhide new PackageManager APIs for API 14
2011-09-21 19:10:58 -07:00
Jaikumar Ganesh
90fb9aa93a
Merge "Make Bluetooth Health constant public." into ics-factoryrom
2011-09-21 17:44:32 -07:00
Jaikumar Ganesh
fd966a124f
Make Bluetooth Health constant public.
...
Change-Id: I366f1231056fe978d85ee80c773d5911badb22e2
2011-09-21 16:03:42 -07:00
Kenny Root
3a9b5fbb97
Unhide new PackageManager APIs for API 14
...
Change-Id: I83110285ccee39a4cd872a1c2af8357f541833d4
2011-09-20 14:35:10 -07:00
Fred Quintana
9bb9cdd17f
am 45ae3e50: am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom
...
* commit '45ae3e50ec8672a85edfd89827334987d0862ee0':
Continuation of the unified account chooser flow.
2011-09-19 10:47:44 -07:00
Fred Quintana
b04fe4e82a
Continuation of the unified account chooser flow.
...
- made the UI match the spec
- added ability to force the account chooser to appear
- added ability to pass in a description that will override the stock one
- added ability to pass in requiredFeatures for addAccount
- added ability to pass in an authTokenType for addAccount
Bug: 5293377
Change-Id: I243c0fd6598c943b1f65753e1f5d3c86629f64f5
2011-09-16 22:55:08 -07:00
Fred Quintana
f338522cba
am 43a5070c: am 3d5759b5: Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
...
* commit '43a5070c1ca89053afb8fb97cb1389cb64840770':
Add a generic account chooser/add account flow for apps.
2011-09-16 12:16:28 -07:00
Fred Quintana
1121bb5e6f
Add a generic account chooser/add account flow for apps.
...
The activity is launched as follows:
Account account1 = new Account("account1@gmail.com", "com.google")
Account account2 = new Account("account2@gmail.com", "com.google")
ArrayList<Account> accounts = new ArrayList<Account>();
accounts.add(account1);
accounts.add(account2);
String[] accountTypes = new String[]{"com.google", "com.android.exchange"};
Bundle addAccountOptions = null;
Intent intent = AccountManager.newChooseAccountIntent(account1, accounts,
accountTypes, addAccountOptions);
startActivityForResult(intent, 0);
Change-Id: I05a467bdc3552a2e39397b0182879351f4324389
2011-09-15 17:40:43 -07:00
Fred Quintana
9d286aaf9a
am 569584be: Merge "Add a generic account chooser/add account flow for apps."
...
* commit '569584be0e51ca6aceb53aa81b5ecac23d1ca55b':
Add a generic account chooser/add account flow for apps.
2011-09-15 16:47:52 -07:00
Fred Quintana
569584be0e
Merge "Add a generic account chooser/add account flow for apps."
2011-09-15 16:44:53 -07:00
Fred Quintana
89e063113c
Add a generic account chooser/add account flow for apps.
...
The activity is launched as follows:
Account account1 = new Account("account1@gmail.com", "com.google")
Account account2 = new Account("account2@gmail.com", "com.google")
ArrayList<Account> accounts = new ArrayList<Account>();
accounts.add(account1);
accounts.add(account2);
String[] accountTypes = new String[]{"com.google", "com.android.exchange"};
Bundle addAccountOptions = null;
Intent intent = AccountManager.newChooseAccountIntent(account1, accounts,
accountTypes, addAccountOptions);
startActivityForResult(intent, 0);
Change-Id: I05a467bdc3552a2e39397b0182879351f4324389
2011-09-15 16:39:50 -07:00
Dianne Hackborn
0641ebd723
am cb995121: Merge "Final (ha ha) API 14."
...
* commit 'cb995121ee4bb4da236e8181fbfbd33bc2f9173a':
Final (ha ha) API 14.
2011-09-15 00:34:38 -07:00
Dianne Hackborn
90d92e6098
Final (ha ha) API 14.
...
Change-Id: I164f9add571f7d825a10036e3b8c9e9eb854d732
2011-09-15 00:28:31 -07:00
Dianne Hackborn
162915eaa7
am df82905c: Merge "Update the public APIs for finding views by text to optionally use content description."
...
* commit 'df82905cf3ceb9192dc8087f934081f809d99bcf':
Update the public APIs for finding views by text to optionally use content description.
2011-09-14 22:35:45 -07:00
Svetoslav Ganov
ea515aeafa
Update the public APIs for finding views by text to optionally use content description.
...
1. Added flags to the search method to specify whether to match text or
content description or both.
2. Added test case for the seach by content description.
3. Updated the code in AccessibilityManager service to reflect the latest
changes there so test automation service works - this is the fake
service used for UI automation.
Change-Id: I14a6779a920ff0430e78947ea5aaf876c2e66076
2011-09-14 19:40:33 -07:00
Marius Renn
09b3c46722
am b861bf30: Merge "Rename of DoodleEffect as part of cleanup (Bug 5287103)."
...
* commit 'b861bf305c3434436990035a88ea850e646fc40b':
Rename of DoodleEffect as part of cleanup (Bug 5287103).
2011-09-14 17:16:14 -07:00
Marius Renn
b861bf305c
Merge "Rename of DoodleEffect as part of cleanup (Bug 5287103)."
2011-09-14 17:13:30 -07:00
Dianne Hackborn
7722eec159
am 67eb4320: Merge "ICS is API 14."
...
* commit '67eb4320d2832b43fe3150ba07fd05ea98ea617f':
ICS is API 14.
2011-09-14 16:05:31 -07:00
Dianne Hackborn
0784cfb4b7
ICS is API 14.
...
Change-Id: I95f500f94ce206ae6ca6938d17537431d8799237
2011-09-14 13:51:59 -07:00
Jean-Michel Trivi
ec17c5c8d5
am e83f771f: Merge "Bug 5300223 RemoteControlClient uses PendingIntent"
...
* commit 'e83f771f0ab8e1e72e1fd2147085223ac8a00ba2':
Bug 5300223 RemoteControlClient uses PendingIntent
2011-09-14 09:09:03 -07:00
Jean-Michel Trivi
e83f771f0a
Merge "Bug 5300223 RemoteControlClient uses PendingIntent"
2011-09-14 09:05:36 -07:00
Jeff Sharkey
9deb01fc0c
am d18addb4: Remove deprecated TrafficStats API.
...
* commit 'd18addb4e3d0cd4da798dd35ad676d98465ebed3':
Remove deprecated TrafficStats API.
2011-09-13 21:12:39 -07:00
Jeff Sharkey
d18addb4e3
Remove deprecated TrafficStats API.
...
Bug: 5314214
Change-Id: If7dc3ef012a0e998e83ab4fef27ff19398d3e14c
2011-09-13 20:43:10 -07:00
Jean-Michel Trivi
6e920e6dac
Bug 5300223 RemoteControlClient uses PendingIntent
...
API change so RemoteControlClient is given a PendingIntent in
its constructor, which will be used for receiving media button
events from remote controls.
Leave the old constructors (but hidden) to not break
current functionality until the AudioManager and AudioService
implementations have been updated.
Change-Id: Ifa12c8036c948931adc386a827dce2936788e1cd
2011-09-13 19:27:20 -07:00
Marius Renn
ab8b070f09
Rename of DoodleEffect as part of cleanup (Bug 5287103).
...
The DoodleEffect semantics have been considerably simplified so that the
name no longer fits the effect outcome. Renamed to BitmapOverlayEffect
(EFFECT_BITMAPOVERLAY).
This is the necessary change to the current.txt.
Change-Id: I43fe0e1f99ec6aedbcb53b186ac322cc51ee83ab
2011-09-13 18:22:04 -07:00
Dianne Hackborn
ac49936fa5
am 48c5fb14: API review: Metadata class not used.
...
* commit '48c5fb14933cba4dcf6ba401b895e59bac4a8420':
API review: Metadata class not used.
2011-09-13 16:27:55 -07:00
Dianne Hackborn
48c5fb1493
API review: Metadata class not used.
...
The Metadata class doesn't actually seem to be used with anything
in the SDK, and the API probably needs some work, so hide it.
Change-Id: Ifecf49130b90cbb4c588ad8104f1e7957978f789
2011-09-13 16:24:45 -07:00
Irfan Sheriff
9c3e293f92
am 651cdfcb: Unhide wifi p2p API
...
* commit '651cdfcbac6245f570475991588ddc2d30265e8d':
Unhide wifi p2p API
2011-09-13 16:09:14 -07:00
Irfan Sheriff
651cdfcbac
Unhide wifi p2p API
...
Bug: 5247957
Change-Id: Id93e30c0cb60f361ba13a840de8f843415777336
2011-09-13 16:04:00 -07:00
Svetoslav Ganov
222de674ab
am bd5c9768: Merge "Adding accessibility delegate mechanism for backwards compatibility support."
...
* commit 'bd5c9768c4432c6cb2bfa5f521d49ff03c087ff8':
Adding accessibility delegate mechanism for backwards compatibility support.
2011-09-12 17:00:31 -07:00
Svetoslav Ganov
bd5c9768c4
Merge "Adding accessibility delegate mechanism for backwards compatibility support."
2011-09-12 16:58:13 -07:00
Svetoslav Ganov
031d9c1389
Adding accessibility delegate mechanism for backwards compatibility support.
...
1. Added an AccessibilityDelegate class in View which can be set by
a client that wants to cutomize accessibility behavior via
composition as opposed to inheritance. Insead overriding a new method in
View thus being bound to the API version that introduced this
method a developer can conditionally inject the accessibility
customization if the platform API version is heigh enough. The
developer will have to override the method of interest of the
delegate. The default implementation of the delegate methods is
the same as that of View in the case that there is no delegate
set. If a delegate is set calling an accessibility related method
on View will be handed off to the corresponsing method of the
delegate.
bug:5259555
Change-Id: I00e750e22e5e7164a1b571cb3d12ecaf4ab93db4
2011-09-12 15:42:19 -07:00
Dianne Hackborn
999cf805a4
am 8a48a2b9: Merge "Fix build."
...
* commit '8a48a2b96adb718f351ca3b6c3f25c74fef52a03':
Fix build.
2011-09-11 11:22:40 -07:00
Dianne Hackborn
b7fd61ee81
Fix build.
...
Change-Id: I8f0f137649ae69100a2b94706ad9b3861d8dbac0
2011-09-11 11:20:21 -07:00
Dianne Hackborn
4819eaab20
am 1a9c6c97: Merge "The wave view attributes should not be public."
...
* commit '1a9c6c97fa9f156d16190e519ae4faa13371fa72':
The wave view attributes should not be public.
2011-09-11 10:58:27 -07:00
Dianne Hackborn
1a9c6c97fa
Merge "The wave view attributes should not be public."
2011-09-11 10:56:01 -07:00
Dianne Hackborn
acc3012cd0
The wave view attributes should not be public.
...
Change-Id: I7f021fc79385f5cf2e252389cc5f672f334ee4c4
2011-09-09 18:35:23 -07:00
Adam Powell
99c3297505
am dbed0722: Fix build
...
* commit 'dbed072251306bb1d8d9cdca46eed491539f92c0':
Fix build
2011-09-09 18:14:17 -07:00
Adam Powell
dbed072251
Fix build
...
Change-Id: I2b1ad9f057367873554ca4df0c93050bbbc9ebb7
2011-09-09 18:09:51 -07:00
Romain Guy
ebb10b0a37
am 3593fc4c: Merge "Go faster!!!!"
...
* commit '3593fc4c3fac8d957db0171387472e7b812c9073':
Go faster!!!!
2011-09-09 17:37:12 -07:00
Romain Guy
1ef3fdbe04
Go faster!!!!
...
The less we do, the faster we draw.
Change-Id: I7bbc3908b36d8ae295ea3e61ef71fd9ee2187970
2011-09-09 15:34:49 -07:00
Adam Powell
201ce14494
am 4eb37f8a: Merge "Bug 5214224 - List item metrics"
...
* commit '4eb37f8a2cd9c2ed96d7f0742e180e5aca619ccb':
Bug 5214224 - List item metrics
2011-09-09 15:19:31 -07:00
Adam Powell
7c8375d652
Bug 5214224 - List item metrics
...
Base list item padding on the theme. Adjust stock framework list items
to obey this. Adjust text sizes in stock list items based on existing
theme attributes.
Change-Id: I98a441e5494fa1d1d34a5f05e525e54e8b0d78b9
2011-09-09 14:41:37 -07:00
Fred Quintana
95df5a2c6d
am 7cbfa977: Merge "Add a form of getAuthToken that both accepts an options Bundle and doesn\'t accepts an activity."
...
* commit '7cbfa977ecb2a7330b372ab59233aa4392c101bd':
Add a form of getAuthToken that both accepts an options Bundle and doesn't accepts an activity.
2011-09-09 09:56:20 -07:00
Fred Quintana
7cbfa977ec
Merge "Add a form of getAuthToken that both accepts an options Bundle and doesn't accepts an activity."
2011-09-09 09:52:45 -07:00
Marco Nelissen
29c8921763
am 02ea7d48: Merge "Fix bug 5045498 Unhide Remote Control Client API"
...
* commit '02ea7d48773210fa0f29299269aca26b3201b1d0':
Fix bug 5045498 Unhide Remote Control Client API
2011-09-09 09:08:05 -07:00