7200 Commits

Author SHA1 Message Date
Wei Wang
75f5b3a8dd am 19bdd64c: Merge "Address API review comments. 1. Moved le stuff to it\'s subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved Advertis
* commit '19bdd64c3b9dd16778575164c13c8af798832f01':
  Address API review comments. 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes.
2014-05-30 21:38:59 +00:00
Dianne Hackborn
25ceaab596 am 3a967f83: Merge "Mark getRecentTasks() and getRunningTasks() as deprecated." into lmp-preview-dev
* commit '3a967f8331a29ec1b5b8a44cda028417e0ef1e2c':
  Mark getRecentTasks() and getRunningTasks() as deprecated.
2014-05-30 21:38:49 +00:00
Santos Cordon
bf82544a96 Merge "Preempt build error from merge with CL (2/2)" 2014-05-30 21:31:57 +00:00
Santos Cordon
dd36901ac0 Preempt build error from merge with CL (2/2)
Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657

Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02
2014-05-30 14:27:03 -07:00
Vinit Deshpande
e73a0ab494 Merge "Accomoditing API Review feedback for WifiScanner" 2014-05-30 21:15:13 +00:00
Wei Wang
94fec83db4 Merge "Address API review comments. 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes." into lmp-preview-dev 2014-05-30 19:39:11 +00:00
Dianne Hackborn
a25a8b289b Mark getRecentTasks() and getRunningTasks() as deprecated.
Change-Id: Idba79d7a4c0b9f0929f8dd27f25bd6aa548f5622
2014-05-30 12:30:35 -07:00
Dianne Hackborn
8b466c19d6 am f6550f0a: Merge "More work on voice interaction visuals." into lmp-preview-dev
* commit 'f6550f0ab2fb1abae6f9d694c87ccba9bede57f4':
  More work on voice interaction visuals.
2014-05-30 17:17:55 +00:00
Dianne Hackborn
2d2e30eeac Merge "More work on voice interaction visuals." into lmp-preview-dev 2014-05-30 17:11:19 +00:00
Yuhao Zheng
8407968db6 Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev 2014-05-30 17:08:07 +00:00
Dianne Hackborn
20d9474904 More work on voice interaction visuals.
There is now a special theme for voice interaction activities
to use, so they can be a panel that is better intergrated with
the rest of the voice interaction experience.  This is still
not completely working, I have some hacks in the demo app to
get it right; I'll fix that in a future change.

Also improve VoiceInteractor to be retained across activity
instances, for things like rotation.

And bump up the number of concurrent broadcasts that are allowed
on non-svelte devices, since they can handle more and this makes
the boot experience better when dispatching BOOT_COMPLETED.

Change-Id: Ie86b5fd09b928da20d645ec2200577dee3e6889d
2014-05-30 10:06:16 -07:00
Vinit Deshpande
c05cb5ffb3 Merge "DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"" into lmp-preview-dev 2014-05-30 15:55:54 +00:00
Amith Yamasani
de8f11654f am 651fcf79: Merge "Tweak LauncherApps API based on feedback" into lmp-preview-dev
* commit '651fcf798faf62f95bafaf3f1aaa1f05358254a2':
  Tweak LauncherApps API based on feedback
2014-05-30 15:53:21 +00:00
Amith Yamasani
fc2ae28f78 Merge "Tweak LauncherApps API based on feedback" into lmp-preview-dev 2014-05-30 15:49:21 +00:00
Vinit Deshpande
55027bb7b8 Accomoditing API Review feedback for WifiScanner
cherry-picked from klp-wireless-dev
SHA1 8217e22356a8828a725ba7654cf25b05a49108fb

Main changes include

- hiding the API for LMP preview
- moved information elements to ScanResult object
- removed objects from events
- changed API names to be more consistent

Bug: 15191968
Change-Id: Ibe3907366aee85f7d56021a536ae0f9f9fb28b38
2014-05-30 08:47:07 -07:00
Martijn Coenen
c2e1dcd428 am 65f8da7f: Merge "Address HCE API review comments." into lmp-preview-dev
* commit '65f8da7f640ef87797fe16d139caa26d55378ab6':
  Address HCE API review comments.
2014-05-30 14:55:25 +00:00
Martijn Coenen
748fca45fc Merge "Address HCE API review comments." into lmp-preview-dev 2014-05-30 14:52:48 +00:00
Niels Egberts
a6cc9b85ad Markup support for framework
Change-Id: Ia5ad6cff7593c295944a90775a1b061c95f5cc3f
2014-05-30 13:48:09 +00:00
Yuhao Zheng
0cb59f2c03 DO NOT MERGE - Wifi Passpoint API change
- hide package android.net.wifi.passpoint
- extend android.net.wifi APIs for Passpoint credential management
  > hide for preview

Bug: 15191967
Change-Id: Ic90818cf5c91e93dd7890774543e08b842edc594
2014-05-29 23:53:21 -07:00
Yuhao Zheng
e90a218cf1 Merge "Wifi Passpoint API change" 2014-05-30 06:48:48 +00:00
Amith Yamasani
e781c81d33 Tweak LauncherApps API based on feedback
UserHandle must be after packageName/componentName.
Improved javadoc for density.
Added getApplicationInfo().
Remove synchronized methods.

Temporarily @hide the old APIs to make sure they continue to work
for unbundled launchers.

Bug: 15025908
Change-Id: Iee6336b54e1b4d5c43f1e643062327ff463cb695
2014-05-29 19:00:40 -07:00
Wei Wang
6d81118032 Address API review comments.
1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes
except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings.
2. Make all callbacks abstract classes instead of interfaces.
3. Moved AdvertisementData and ScanRecord out and removed
AdvertiseBaseData
4. Removed newBuild and use new Builder for all builders.
5. Using setxxx in builders.
6. Misc other changes.

Fixes b/15140940

Change-Id: I32ae3d24a9491baf96048040b5ac78f6f731e468
NO_SQ: multi-project submit
2014-05-29 17:21:54 -07:00
Yuhao Zheng
8a9eb81df1 Wifi Passpoint API change
- hide package android.net.wifi.passpoint
- extend android.net.wifi APIs for Passpoint credential management
  > hide for preview

Bug: 15191967
Change-Id: Ic90818cf5c91e93dd7890774543e08b842edc594
2014-05-29 16:18:36 -07:00
Vinit Deshpande
22e2ea670f DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"
This reverts commit 1f3b490645f7c14459ac6f864eaf742448f7b764.

This is to hide WPS API for developer preview. They may get
activated again later.

Bug: 15191968
Change-Id: I21dbd5cd0345fbb2e55603d6b2af23d83d9c2ae2
2014-05-29 21:57:24 +00:00
Christopher Tate
3d5e5c7b26 Merge "DO NOT MERGE Implementation of TaskManager reschedule/cancel" into lmp-preview-dev 2014-05-29 21:17:32 +00:00
Martijn Coenen
df48db3c7c Address HCE API review comments.
Remove AidGroup from public APIs.

Bug: 15089341
Change-Id: Ia8e038a12891abc6f1a8e82dbf30b8952e0b1fd7
2014-05-29 21:10:01 +00:00
Paul Lawrence
fab7cbc9ce DO NOT MERGE: Hide crypto consts from docs
@bug 15192967

Change-Id: I134b2cb2d2841bc101e63a8a4dbd86f7b7bdca14
(cherry picked from commit 81ab14fb19a2669aa54c1a333c807c22d5c41a8e)
2014-05-29 16:03:43 +00:00
Paul Lawrence
b6102427ae Merge "Hide crypto consts from docs" 2014-05-29 14:43:09 +00:00
Yorke Lee
547d9b9b55 Merge "Unhide ContactsCount API" 2014-05-29 14:35:53 +00:00
Dianne Hackborn
d3a5b916b1 am c2091a1f: Merge "Add system layer for voice interaction services." into lmp-preview-dev
* commit 'c2091a1fbc463941b3e42db36e369124ac3c1013':
  Add system layer for voice interaction services.
2014-05-29 09:42:56 +00:00
Matthew Williams
9b9244b694 DO NOT MERGE Implementation of TaskManager reschedule/cancel
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions
2014-05-29 00:45:02 +00:00
Zhijun He
d5a8d65b43 am 239ac054: Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev
* commit '239ac0541bf7e0fc8b301d077b40e3e52cf32161':
  Camera2: Update spec for thumbnail cropping behavior
2014-05-29 00:42:32 +00:00
Dianne Hackborn
a923758d80 Merge "Add system layer for voice interaction services." into lmp-preview-dev 2014-05-29 00:18:25 +00:00
Dianne Hackborn
e30e02f5d9 Add system layer for voice interaction services.
New window layer that voice interaction service windows
go in to.  Includes a new voice-specific content rectangle
that voice activities are placed in to.

Add specific animations for this layer, sliding down from
the top (though this can be customized by the voice interaction
service).

Also add the concept of activities running for voice interaction
services for purposes of adjusting the animation used for them,
again sliding from the top, but not (yet?) customizable by the
voice interaction service.

Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
2014-05-28 17:16:51 -07:00
Adam Powell
88e719fd3e am 49a4961e: Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev
* commit '49a4961efde042f4921393f59cff86c2b7889c71':
  Toolbar factoring and ActionBar functionality integration
2014-05-28 23:07:25 +00:00
Zhijun He
f5fe63c35c Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev 2014-05-28 22:49:31 +00:00
Zhijun He
50f7243ca0 Camera2: Update spec for thumbnail cropping behavior
Also update FULL capability spec (remove ZSL from the requirement list).

Bug: 15168075
Change-Id: I864baf35ffab9047b52facb29011682e724bbc9b
2014-05-28 15:23:21 -07:00
Evan Charlton
89f858c874 Merge "@hide Telecomm APIs [DO NOT MERGE]" into lmp-preview-dev 2014-05-28 22:14:07 +00:00
ztenghui
c9ad54e8ec Merge "Add translation and scale to the group tag and related tests." 2014-05-28 21:59:42 +00:00
Adam Powell
6addcea6ae Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev 2014-05-28 21:44:01 +00:00
Eino-Ville Talvala
5b02e9f65f am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
* commit 'a4aad3d0e5c258d6bbf6254ec5ab80a470b1b529':
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle
2014-05-28 20:35:58 +00:00
Eino-Ville Talvala
b9a65de1f7 Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
* changes:
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle
2014-05-28 20:33:42 +00:00
ztenghui
452f6ece7f Add translation and scale to the group tag and related tests.
bug:15288554

Change-Id: Iebe176d0a9c2c566d1910674a068e65e15569829
2014-05-28 13:22:44 -07:00
Evan Charlton
b4eb0c0863 @hide Telecomm APIs [DO NOT MERGE]
Change-Id: Id2d8d21f5de79bd5ffa468a82b29b77daf07e120
2014-05-28 13:22:05 -07:00
Paul Lawrence
e8fdc541dc Hide crypto consts from docs
@bug 15192967

Change-Id: I134b2cb2d2841bc101e63a8a4dbd86f7b7bdca14
2014-05-28 12:58:13 -07:00
Adam Powell
e021e6ed89 Toolbar factoring and ActionBar functionality integration
Toolbars now can act in the role of ActionBar with the exception of
navigation modes. Expandable action views are now supported as well as
populating menu items from a host window.

Change-Id: If477db9c7ad9f95723f28cf73cbf03a07ce9d6ad
2014-05-28 12:36:38 -07:00
Christopher Tate
560ce61c59 Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev 2014-05-28 19:03:03 +00:00
Derek Sollenberger
90735dc0c6 Merge "Cleanup Canvas API by deprecating a few methods." 2014-05-28 18:33:27 +00:00
Derek Sollenberger
0d181540e0 Cleanup Canvas API by deprecating a few methods.
The clipRegion(Region) API exposed a different semantic than all other clip APIs by not
respecting the current matrix. The same behavior can be achieved by calling clipRect(Rect)
on the Rects within a Region.

bug: 14650725
Change-Id: I7e91813b8e2474f327e070e549fa303d66f8b552
2014-05-28 14:26:06 -04:00
Griff Hazen
8c2a828849 am c15d315a: am a9cb1e66: Add full screen size preset to WearableExtender
* commit 'c15d315aeb2c23895e940560784bd51f7962b702':
  Add full screen size preset to WearableExtender
2014-05-28 17:44:11 +00:00